Merge from viewer2 trunk.

1 files changed, 2 insertions, 5 deletions

diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h
index 1333b098bc..e4a32dbe1d 100644
--- a/indra/newview/llimfloatercontainer.h
+++ b/indra/newview/llimfloatercontainer.h
@@ -43,7 +43,7 @@
 
 class LLTabContainer;
 
-class LLIMFloaterContainer : public LLMultiFloater, public LLAvatarPropertiesObserver, public LLGroupMgrObserver
+class LLIMFloaterContainer : public LLMultiFloater, public LLAvatarPropertiesObserver, public LLParticularGroupMgrObserver
 {
 public:
 	LLIMFloaterContainer(const LLSD& seed);
@@ -57,7 +57,7 @@ public:
 								LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
 
 	void processProperties(void* data, EAvatarProcessorType type);
-	void changed(LLGroupChange gc);
+	void changed(const LLUUID& group_id, LLGroupChange gc);
 
 	static LLFloater* getCurrentVoiceFloater();
 
@@ -69,9 +69,6 @@ private:
 	typedef std::map<LLUUID,LLPanel*> avatarID_panel_map_t;
 	avatarID_panel_map_t mSessions;
 
-	typedef std::vector<LLUUID> groupIDs_t;
-	groupIDs_t mGroupID;
-
 	void onCloseFloater(LLUUID avatar_id);
 };