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, 8 insertions, 0 deletions

diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index b55963ec4a..0864ec1bc3 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -72,6 +72,14 @@ protected:
 	profile_tabs_t& getTabContainer() { return mTabContainer; }
 
 private:
+	// LLCacheName will call this function when avatar name is loaded from server.
+	// This is required to display names that have not been cached yet.
+	void onAvatarNameCached(
+		const LLUUID& id, 
+		const std::string& first_name,
+		const std::string& last_name,
+		BOOL is_group);
+
 	LLTabContainer* mTabCtrl;	
 	profile_tabs_t mTabContainer;
 	LLUUID mAvatarId;