1 files changed, 24 insertions, 8 deletions

diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index f5356ef926..11a6905a63 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -45,6 +45,13 @@ class LLFloaterIM;
 class LLIMMgr : public LLSingleton<LLIMMgr>
 {
 public:
+	enum EInvitationType
+	{
+		INVITATION_TYPE_INSTANT_MESSAGE = 0,
+		INVITATION_TYPE_VOICE = 1,
+		INVITATION_TYPE_IMMEDIATE = 2
+	};
+
 	LLIMMgr();
 	virtual ~LLIMMgr();
 
@@ -96,12 +103,14 @@ public:
 	// deleted.
 	void removeSession(const LLUUID& session_id);
 
-	void inviteToSession(const LLUUID& session_id, 
-						const LLString& session_name, 
-						const LLUUID& caller, 
-						const LLString& caller_name,
-						EInstantMessage type,
-						const LLString& session_handle = LLString::null);
+	void inviteToSession(
+		const LLUUID& session_id, 
+		const LLString& session_name, 
+		const LLUUID& caller, 
+		const LLString& caller_name,
+		EInstantMessage type,
+		EInvitationType inv_type, 
+		const LLString& session_handle = LLString::null);
 
 	//Updates a given session's session IDs.  Does not open,
 	//create or do anything new.  If the old session doesn't
@@ -147,7 +156,7 @@ public:
 
 	static LLUUID computeSessionID(EInstantMessage dialog, const LLUUID& other_participant_id);
 
-	void clearPendingVoiceInviation(const LLUUID& session_id);
+	void clearPendingInviation(const LLUUID& session_id);
 
 	LLSD getPendingAgentListUpdates(const LLUUID& session_id);
 	void addPendingAgentListUpdates(
@@ -155,6 +164,9 @@ public:
 		const LLSD& updates);
 	void clearPendingAgentListUpdates(const LLUUID& session_id);
 
+	//HACK: need a better way of enumerating existing session, or listening to session create/destroy events
+	const std::set<LLViewHandle>& getIMFloaterHandles() { return mFloaters; }
+
 private:
 	class LLIMSessionInvite;
 
@@ -193,7 +205,7 @@ private:
 	// An IM has been received that you haven't seen yet.
 	BOOL mIMReceived;
 
-	LLSD mPendingVoiceInvitations;
+	LLSD mPendingInvitations;
 	LLSD mPendingAgentListUpdates;
 };
 
@@ -203,6 +215,10 @@ class LLFloaterIM : public LLMultiFloater
 public:
 	LLFloaterIM();
 	/*virtual*/ BOOL postBuild();
+
+	static std::map<std::string,LLString> sEventStringsMap;
+	static std::map<std::string,LLString> sErrorStringsMap;
+	static std::map<std::string,LLString> sForceCloseSessionMap;
 };
 
 // Globals