4 files changed, 2 insertions, 38 deletions
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index e5c4547226..2aaf403d5f 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -147,17 +147,6 @@ void LLFloaterTopObjects::handle_land_reply(LLMessageSystem* msg, void** data)
 
 }
 
-void LLFloaterTopObjects::onAvatarNameCache(const LLUUID& agent_id,
-									   const LLAvatarName& av_name,
-									   LLSD element)
-{	
-	LLScrollListCtrl *list = getChild<LLScrollListCtrl>("objects_list");
-
-	element["columns"][2]["value"] = av_name.getCompleteName();
-
-	list->addElement(element);
-}
-
 void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 {
 	U32 request_flags;
@@ -182,7 +171,6 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		F32 mono_score = 0.f;
 		bool have_extended_data = false;
 		S32 public_urls = 0;
-		LLUUID owner_id;
 
 		msg->getU32Fast(_PREHASH_ReportData, _PREHASH_TaskLocalID, task_local_id, block);
 		msg->getUUIDFast(_PREHASH_ReportData, _PREHASH_TaskID, task_id, block);
@@ -198,10 +186,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 			msg->getU32("DataExtended", "TimeStamp", time_stamp, block);
 			msg->getF32("DataExtended", "MonoScore", mono_score, block);
 			msg->getS32(_PREHASH_ReportData,"PublicURLs",public_urls,block);
-			msg->getUUID("DataExtended","OwnerID",owner_id,block);
 		}
 
-
 		LLSD element;
 
 		element["id"] = task_id;
@@ -252,16 +238,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 			columns[6]["font"] = "SANSSERIF";
 		}
 		element["columns"] = columns;
+		list->addElement(element);
 		
-		if (!owner_id.isNull())
-		{
-			LLAvatarNameCache::get(owner_id, boost::bind(&LLFloaterTopObjects::onAvatarNameCache, this, _1, _2, element));
-		}
-		else
-		{
-			list->addElement(element);
-		}
-
 		mObjectListData.append(element);
 		mObjectListIDs.push_back(task_id);
 
diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h
index edd91c491f..a608ca20f1 100644
--- a/indra/newview/llfloatertopobjects.h
+++ b/indra/newview/llfloatertopobjects.h
@@ -29,11 +29,8 @@
 
 #include "llfloater.h"
 
-class LLAvatarName;
 class LLUICtrl;
 
-#include <boost/signals2.hpp>	// boost::signals2::trackable
-
 class LLFloaterTopObjects : public LLFloater
 {
 	friend class LLFloaterReg;
@@ -54,8 +51,6 @@ public:
 
 	static void setMode(U32 mode);
 
-	void onAvatarNameCache(const LLUUID& id, const LLAvatarName& av_name, LLSD element);
-
 private:
 	LLFloaterTopObjects(const LLSD& key);
 	~LLFloaterTopObjects();
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 650d329e18..3f72d66bfb 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -62,7 +62,7 @@ class LLIMModel :  public LLSingleton<LLIMModel>
 {
 public:
 
-	struct LLIMSession
+	struct LLIMSession : public boost::signals2::trackable
 	{
 		typedef enum e_session_type
 		{   // for now we have 4 predefined types for a session
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 598ad7afc6..0ca30d5f3d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2509,15 +2509,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				invite_bucket = (struct invite_bucket_t*) &binary_bucket[0];
 				S32 membership_fee = ntohl(invite_bucket->membership_fee);
 
-				// IDEVO Clean up legacy name "Resident" in message constructed in
-				// lldatagroups.cpp
-				U32 pos = message.find(" has invited you to join a group.\n");
-				if (pos != std::string::npos)
-				{
-					// use cleaned-up name from above
-					message = name + message.substr(pos);
-				}
-
 				LLSD payload;
 				payload["transaction_id"] = session_id;
 				payload["group_id"] = from_id;