Merge

1 files changed, 19 insertions, 0 deletions

diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 8f07c67fb1..22efa5dc35 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -35,6 +35,7 @@
 
 #include "llpanel.h"
 #include "llavatarpropertiesprocessor.h"
+#include "llcallingcard.h"
 
 class LLComboBox;
 class LLLineEditor;
@@ -120,13 +121,22 @@ private:
 */
 class LLPanelAvatarProfile
 	: public LLPanelProfileTab
+	, public LLFriendObserver
 {
 public:
 	LLPanelAvatarProfile();
+	/*virtual*/ ~LLPanelAvatarProfile();
 
 	/*virtual*/ void onOpen(const LLSD& key);
 
 	/**
+	 * LLFriendObserver trigger
+	 */
+	virtual void changed(U32 mask);
+
+	/*virtual*/ void setAvatarId(const LLUUID& id);
+
+	/**
 	 * Processes data received from server.
 	 */
 	/*virtual*/ void processProperties(void* data, EAvatarProcessorType type);
@@ -246,9 +256,18 @@ private:
 */
 class LLPanelAvatarNotes 
 	: public LLPanelProfileTab
+	, public LLFriendObserver
 {
 public:
 	LLPanelAvatarNotes();
+	/*virtual*/ ~LLPanelAvatarNotes();
+
+	virtual void setAvatarId(const LLUUID& id);
+
+	/** 
+	 * LLFriendObserver trigger
+	 */
+	virtual void changed(U32 mask);
 
 	/*virtual*/ void onOpen(const LLSD& key);