svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release

1 files changed, 24 insertions, 4 deletions

diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 8732484e0e..aac6fd63ce 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -55,11 +55,11 @@ public:
 					  EInstantMessage dialog,
 					  const LLUUID& other_participant_id);
 
-	// Adds a session using the given session_id. If the session already exists 
+	// Adds a session using a specific group of starting agents
 	// the dialog type is assumed correct. Returns the uuid of the session.
 	LLUUID addSession(const std::string& name,
 					  EInstantMessage dialog,
-					  const LLUUID& session_id,
+					  const LLUUID& other_participant_id,
 					  const LLDynamicArray<LLUUID>& ids);
 
 	// This removes the panel referenced by the uuid, and then
@@ -67,6 +67,12 @@ public:
 	// deleted.
 	void removeSession(const LLUUID& session_id);
 
+	//Updates a given session's session IDs.  Does not open,
+	//create or do anything new.  If the old session doesn't
+	//exist, then nothing happens.
+	void updateFloaterSessionID(const LLUUID& old_session_id,
+								const LLUUID& new_session_id);
+
 	void processIMTypingStart(const LLIMInfo* im_info);
 	void processIMTypingStop(const LLIMInfo* im_info);
 
@@ -105,13 +111,25 @@ public:
 	// is no matching panel.
 	LLFloaterIMPanel* findFloaterBySession(const LLUUID& session_id);
 
+	void onDropRequestReplyReceived(const LLUUID& session_id);
+
 private:
 	// create a panel and update internal representation for
 	// consistency. Returns the pointer, caller (the class instance
 	// since it is a private method) is not responsible for deleting
 	// the pointer.
-	LLFloaterIMPanel* createFloater(const LLUUID& session_id, const LLUUID& target_id,
-							const std::string& name, EInstantMessage dialog, BOOL user_initiated = FALSE);
+	LLFloaterIMPanel* createFloater(const LLUUID& session_id,
+									const LLUUID& target_id,
+									const std::string& name,
+									EInstantMessage dialog,
+									BOOL user_initiated = FALSE);
+
+	LLFloaterIMPanel* createFloater(const LLUUID& session_id,
+									const LLUUID& target_id,
+									const std::string& name,
+									const LLDynamicArray<LLUUID>& ids,
+									EInstantMessage dialog,
+									BOOL user_initiated = FALSE);
 
 	// This simple method just iterates through all of the ids, and
 	// prints a simple message if they are not online. Used to help
@@ -131,6 +149,8 @@ private:
 
 	// An IM has been received that you haven't seen yet.
 	BOOL mIMReceived;
+
+	LLSD mSessionsDropRequested;
 };