merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3

EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511

1 files changed, 0 insertions, 24 deletions

diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index cd18dc4462..1235340f57 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -44,7 +44,6 @@ static std::string PANEL_NOTES = "panel_notes";
 
 LLPanelProfileView::LLPanelProfileView()
 :	LLPanelProfile()
-,	mCacheNameCallbackConnected(false)
 {
 }
 
@@ -66,21 +65,6 @@ void LLPanelProfileView::onOpen(const LLSD& key)
 	}
 
 	LLPanelProfile::onOpen(key);
-
-	// *HACK Profile View is created before gCacheName, as a result we can't call addObserver()
-	// in postBuild() and have to connect callback here.
-	// This will call addObserver() once per LLPanelProfileView instance.
-	if(!mCacheNameCallbackConnected)
-	{
-		gCacheName->addObserver(boost::bind(&LLPanelProfileView::cacheNameCallback, this, _1, _2, _3, _4));
-		mCacheNameCallbackConnected = true;
-	}
-
-	// getFullName() will return "(Loading...)" for non cached names, 
-	// in this case cacheNameCallback() will resolve the name.
-	std::string full_name;
-	gCacheName->getFullName(getAvatarId(),full_name);
-	childSetValue("user_name",full_name);
 }
 
 BOOL LLPanelProfileView::postBuild()
@@ -105,11 +89,3 @@ void LLPanelProfileView::onBackBtnClick()
 		parent->openPreviousPanel();
 	}
 }
-
-void LLPanelProfileView::cacheNameCallback(const LLUUID& id, const std::string& first_name, const std::string& last_name, BOOL is_group)
-{
-	if(getAvatarId() == id)
-	{
-		childSetValue("user_name", first_name + " " + last_name);
-	}
-}