Merge remote-tracking branch 'github-liru/master' into NixTesting

Author: RouterGray

indra/llmath/lloctree.h

@@ -537,7 +537,7 @@ class LLOctreeNode : public LLTreeNode<T>
 					OctreeStats::getInstance()->realloc(old_cap,mData.capacity());
 #endif
 
-				this->notifyAddition(data);
+				LLOctreeNode<T>::notifyAddition(data);
 				return true;
 			}
 			else
@@ -593,7 +593,7 @@ class LLOctreeNode : public LLTreeNode<T>
 						OctreeStats::getInstance()->realloc(old_cap,mData.capacity());
 #endif
 
-					this->notifyAddition(data);
+					LLOctreeNode<T>::notifyAddition(data);
 					return true;
 				}
 

indra/newview/jcfloaterareasearch.cpp

@@ -299,6 +299,7 @@ void JCFloaterAreaSearch::processObjectPropertiesFamily(LLMessageSystem* msg, vo
 	// We cache unknown objects (to avoid having to request them later)
 	// and requested objects.
 	msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_OwnerID, data->owner_id);
+	if (auto obj = gObjectList.findObject(object_id)) obj->mOwnerID = data->owner_id; // Singu Note: Try to get Owner whenever possible
 	msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_GroupID, data->group_id);
 	msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, data->name);
 	msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, data->desc);

indra/newview/lldrawable.cpp

@@ -1149,6 +1149,7 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
 		//must be an active volume
 		if (!mSpatialBridge)
 		{
+			// Spatial bridge ctors self-register...
 			if (mVObjp->isHUDAttachment())
 			{
 				setSpatialBridge(new LLHUDBridge(this, getRegion()));
@@ -1615,9 +1616,9 @@ void LLSpatialBridge::cleanupReferences()
 			}
 		}*/
 
-		LLDrawable* drawablep = mDrawable;
-		mDrawable = NULL;
-		drawablep->setSpatialBridge(NULL);
+		LLPointer<LLDrawable> drawablep = mDrawable;
+		mDrawable = nullptr;
+		drawablep->setSpatialBridge(nullptr);
 	}
 }
 

indra/newview/llfloateravatarlist.cpp

@@ -363,45 +363,45 @@ static void cmd_teleport(const LLAvatarListEntry* entry);
 namespace
 {
 	typedef LLMemberListener<LLView> view_listener_t;
-	class RadarTrack : public view_listener_t
+	class RadarTrack final : public view_listener_t
 	{
-		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
 		{
 			LLFloaterAvatarList::instance().onClickTrack();
 			return true;
 		}
 	};
 
-	class RadarFocus : public view_listener_t
+	class RadarFocus final : public view_listener_t
 	{
-		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
 		{
 			LLFloaterAvatarList::setFocusAvatar(LFIDBearer::getActiveSelectedID());
 			return true;
 		}
 	};
 
-	class RadarFocusPrev : public view_listener_t
+	class RadarFocusPrev final : public view_listener_t
 	{
-		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
 		{
 			LLFloaterAvatarList::instance().focusOnPrev(userdata.asInteger());
 			return true;
 		}
 	};
 
-	class RadarFocusNext : public view_listener_t
+	class RadarFocusNext final : public view_listener_t
 	{
-		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
 		{
 			LLFloaterAvatarList::instance().focusOnNext(userdata.asInteger());
 			return true;
 		}
 	};
 
-	class RadarAnnounceKeys : public view_listener_t
+	class RadarAnnounceKeys final : public view_listener_t
 	{
-		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) override
 		{
 			LLFloaterAvatarList::instance().sendKeys();
 			return true;

indra/newview/llimprocessing.cpp

@@ -514,22 +514,22 @@ bool group_vote_callback(const LLSD& notification, const LLSD& response)
 }
 static LLNotificationFunctorRegistration group_vote_callback_reg("GroupVote", group_vote_callback);
 
-void LLIMProcessing::processNewMessage(LLUUID from_id,
+void LLIMProcessing::processNewMessage(const LLUUID& from_id,
     BOOL from_group,
-    LLUUID to_id,
+    const LLUUID& to_id,
     U8 offline,
     EInstantMessage dialog, // U8
-    LLUUID session_id,
+    const LLUUID& session_id,
     U32 timestamp,
-    std::string name,
-    std::string message,
+    std::string& name,
+    std::string& message,
     U32 parent_estate_id,
-    LLUUID region_id,
+    const LLUUID& region_id,
     LLVector3 position,
     U8 *binary_bucket,
     S32 binary_bucket_size,
     LLHost &sender,
-    LLUUID aux_id)
+    const LLUUID& aux_id)
 {
 	LLChat chat;
 	std::string buffer;
@@ -566,6 +566,10 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
 		// object IMs contain sender object id in session_id (STORM-1209)
 		|| (chat.mSourceType == CHAT_SOURCE_OBJECT && LLMuteList::getInstance()->isMuted(session_id));
 
+	// Singu Note: Try to get Owner whenever possible, here owner is the from id
+	if (chat.mSourceType == CHAT_SOURCE_OBJECT && session_id.notNull())
+		if (auto obj = gObjectList.findObject(session_id)) obj->mOwnerID = from_id;
+
 	bool is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
             LLMuteList::getInstance()->isLinden(name);
 	chat.mMuted = is_muted && !is_linden;
@@ -1967,15 +1971,17 @@ void LLIMProcessing::requestOfflineMessagesCoro(const LLCoroResponder& responder
             from_group = message_data["from_group"].asString() == "Y";
         }
 
+        auto agentName = message_data["from_agent_name"].asString();
+        auto message = message_data["message"].asString();
         LLIMProcessing::processNewMessage(message_data["from_agent_id"].asUUID(),
             from_group,
             message_data["to_agent_id"].asUUID(),
             IM_OFFLINE,
             (EInstantMessage)message_data["dialog"].asInteger(),
             LLUUID::null, // session id, since there is none we can only use frienship/group invite caps
             message_data["timestamp"].asInteger(),
-            message_data["from_agent_name"].asString(),
-            message_data["message"].asString(),
+            agentName,
+            message,
             parent_estate_id,
             message_data["region_id"].asUUID(),
             position,

indra/newview/llimprocessing.h

@@ -38,22 +38,22 @@ class LLIMProcessing
 {
 public:
     // Pre-process message for IM manager
-    static void processNewMessage(LLUUID from_id,
+    static void processNewMessage(const LLUUID& from_id,
         BOOL from_group,
-        LLUUID to_id,
+        const LLUUID& to_id,
         U8 offline,
         EInstantMessage dialog, // U8
-        LLUUID session_id,
+        const LLUUID& session_id,
         U32 timestamp,
-        std::string agentName,
-        std::string message,
+        std::string& agentName,
+        std::string& message,
         U32 parent_estate_id,
-        LLUUID region_id,
+        const LLUUID& region_id,
         LLVector3 position,
         U8 *binary_bucket,
         S32 binary_bucket_size,
         LLHost &sender,
-        LLUUID aux_id = LLUUID::null);
+        const LLUUID& aux_id = LLUUID::null);
 
     // Either receives list of offline messages from 'ReadOfflineMsgs' capability
     // or uses legacy method

indra/newview/llpanelprofile.cpp

@@ -41,7 +41,11 @@
 #include "lltabcontainer.h"
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
+#include "llmutelist.h"
+#endif
+#include "llfloatermute.h"
 
+#ifdef AI_UNUSED
 static const std::string PANEL_PICKS = "panel_picks";
 #endif // AI_UNUSED
 
@@ -55,19 +59,19 @@ std::string getProfileURL(const std::string& agent_name)
 	llassert(!url.empty());
 	LLSD subs;
 	subs["AGENT_NAME"] = agent_name;
-	url = LLWeb::expandURLSubstitutions(url,subs);
+	url = LLWeb::expandURLSubstitutions(url, subs);
 	LLStringUtil::toLower(url);
 	return url;
 }
 
-class LLProfileHandler : public LLCommandHandler
+class LLProfileHandler final : public LLCommandHandler
 {
 public:
 	// requires trusted browser to trigger
 	LLProfileHandler() : LLCommandHandler("profile", UNTRUSTED_THROTTLE) { }
 
 	bool handle(const LLSD& params, const LLSD& query_map,
-		LLMediaCtrl* web)
+		LLMediaCtrl* web) override
 	{
 		if (params.size() < 1) return false;
 		std::string agent_name = params[0];
@@ -80,14 +84,14 @@ class LLProfileHandler : public LLCommandHandler
 };
 LLProfileHandler gProfileHandler;
 
-class LLAgentHandler : public LLCommandHandler
+class LLAgentHandler final : public LLCommandHandler
 {
 public:
 	// requires trusted browser to trigger
 	LLAgentHandler() : LLCommandHandler("agent", UNTRUSTED_THROTTLE) { }
 
 	bool handle(const LLSD& params, const LLSD& query_map,
-		LLMediaCtrl* web)
+		LLMediaCtrl* web) override
 	{
 		if (params.size() < 2) return false;
 		LLUUID avatar_id;
@@ -144,6 +148,12 @@ class LLAgentHandler : public LLCommandHandler
 			return true;
 		}
 
+		if (verb == "removefriend")
+		{
+			LLAvatarActions::removeFriendDialog(avatar_id);
+			return true;
+		}
+
 		if (verb == "mute")
 		{
 			if (! LLAvatarActions::isBlocked(avatar_id))
@@ -162,6 +172,28 @@ class LLAgentHandler : public LLCommandHandler
 			return true;
 		}
 
+		if (verb == "block")
+		{
+			if (params.size() > 2)
+			{
+				const std::string object_name = LLURI::unescape(params[2].asString());
+				LLMute mute(avatar_id, object_name, LLMute::OBJECT);
+				LLMuteList::getInstance()->add(mute);
+				LLFloaterMute::showInstance()->selectMute(mute.mID);
+			}
+			return true;
+		}
+
+		if (verb == "unblock")
+		{
+			if (params.size() > 2)
+			{
+				const std::string object_name = params[2].asString();
+				LLMute mute(avatar_id, object_name, LLMute::OBJECT);
+				LLMuteList::getInstance()->remove(mute);
+			}
+			return true;
+		}
 		return false;
 	}
 };
@@ -171,13 +203,13 @@ LLAgentHandler gAgentHandler;
 #ifdef AI_UNUSED
 //-- LLPanelProfile::ChildStack begins ----------------------------------------
 LLPanelProfile::ChildStack::ChildStack()
-:	mParent(NULL)
+:	mParent(nullptr)
 {
 }
 
 LLPanelProfile::ChildStack::~ChildStack()
 {
-	while (mStack.size() != 0)
+	while (!mStack.empty())
 	{
 		view_list_t& top = mStack.back();
 		for (view_list_t::const_iterator it = top.begin(); it != top.end(); ++it)
@@ -217,7 +249,7 @@ bool LLPanelProfile::ChildStack::push()
 /// Restore saved children (adding them back to the child list).
 bool LLPanelProfile::ChildStack::pop()
 {
-	if (mStack.size() == 0)
+	if (mStack.empty())
 	{
 		LL_WARNS() << "Empty stack" << LL_ENDL;
 		llassert(mStack.size() == 0);
@@ -240,7 +272,7 @@ bool LLPanelProfile::ChildStack::pop()
 void LLPanelProfile::ChildStack::preParentReshape()
 {
 	mSavedStack = mStack;
-	while(mStack.size() > 0)
+	while(!mStack.empty())
 	{
 		pop();
 	}
@@ -255,9 +287,8 @@ void LLPanelProfile::ChildStack::postParentReshape()
 	for (stack_t::const_iterator stack_it = mStack.begin(); stack_it != mStack.end(); ++stack_it)
 	{
 		const view_list_t& vlist = (*stack_it);
-		for (view_list_t::const_iterator list_it = vlist.begin(); list_it != vlist.end(); ++list_it)
+		for (auto viewp : vlist)
 		{
-			LLView* viewp = *list_it;
 			LL_DEBUGS() << "removing " << viewp->getName() << LL_ENDL;
 			mParent->removeChild(viewp);
 		}
@@ -273,9 +304,9 @@ void LLPanelProfile::ChildStack::dump()
 		std::ostringstream dbg_line;
 		dbg_line << "lvl #" << lvl << ":";
 		const view_list_t& vlist = (*stack_it);
-		for (view_list_t::const_iterator list_it = vlist.begin(); list_it != vlist.end(); ++list_it)
+		for (auto list_it : vlist)
 		{
-			dbg_line << " " << (*list_it)->getName();
+			dbg_line << " " << list_it->getName();
 		}
 		LL_DEBUGS() << dbg_line.str() << LL_ENDL;
 	}
@@ -372,7 +403,7 @@ void LLPanelProfile::onOpen()
 void LLPanelProfile::onTabSelected(const LLSD& param)
 {
 	std::string tab_name = param.asString();
-	if (NULL != getTabContainer()[tab_name])
+	if (nullptr != getTabContainer()[tab_name])
 	{
 		getTabContainer()[tab_name]->onOpen(getAvatarId());
 	}
@@ -416,7 +447,7 @@ void LLPanelProfile::closePanel(LLPanel* panel)
 
 		// Prevent losing focus by the floater
 		const child_list_t* child_list = getChildList();
-		if (child_list->size() > 0)
+		if (!child_list->empty())
 		{
 			child_list->front()->setFocus(TRUE);
 		}

indra/newview/llselectmgr.cpp

@@ -5446,6 +5446,7 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
 			node->mInventorySerial = inv_serial;
 			node->mSitName.assign(sit_name);
 			node->mTouchName.assign(touch_name);
+			if (auto obj = node->getObject()) obj->mOwnerID = owner_id; // Singu Note: Try to get Owner whenever possible
 		}
 	}