1 files changed, 69 insertions, 17 deletions

diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 72fd006222..c002434a18 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -48,6 +48,7 @@ class LLFloaterChatterBox;
 class LLUUID;
 class LLFloaterIMPanel;
 class LLFriendObserver;
+class LLCallDialogManager;	
 
 class LLIMModel :  public LLSingleton<LLIMModel>
 {
@@ -55,11 +56,21 @@ public:
 
 	struct LLIMSession
 	{
+		typedef enum e_session_type
+		{   // for now we have 4 predefined types for a session
+			P2P_SESSION,
+			GROUP_SESSION,
+			ADHOC_SESSION,
+			AVALINE_SESSION,
+		} SType;
+
 		LLIMSession(const LLUUID& session_id, const std::string& name, 
 			const EInstantMessage& type, const LLUUID& other_participant_id, const std::vector<LLUUID>& ids);
 		virtual ~LLIMSession();
 
 		void sessionInitReplyReceived(const LLUUID& new_session_id);
+		void setSessionType(); //define what type of session was opened
+		void addMessagesFromHistory(const std::list<LLSD>& history);
 		void addMessage(const std::string& from, const LLUUID& from_id, const std::string& utf8_text, const std::string& time);
 		void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state);
 		static void chatFromLogFile(LLLogChat::ELogLineType type, const LLSD& msg, void* userdata);
@@ -67,10 +78,18 @@ public:
 		LLUUID mSessionID;
 		std::string mName;
 		EInstantMessage mType;
+		SType mSessionType;
 		LLUUID mOtherParticipantID;
 		std::vector<LLUUID> mInitialTargetIDs;
+		LLCallDialogManager* mCallDialogManager;
+
+		// connection to voice channel state change signal
+		boost::signals2::connection mVoiceChannelStateChangeConnection;
 
-		//does NOT include system messages
+		//does NOT include system messages and agent's messages
+		S32 mParticipantUnreadMessageCount;
+
+		// does include all incoming messages
 		S32 mNumUnread;
 
 		std::list<LLSD> mMsgs;
@@ -146,11 +165,6 @@ public:
 	bool addMessage(const LLUUID& session_id, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true);
 
 	/**
-	 * Adds message without new message notification.
-	 */
-	void addMessageSilently(LLIMSession& session, const std::string& from, const LLUUID& other_participant_id, const std::string& utf8_text, bool log2file = true);
-
-	/**
 	 * Add a system message to an IM Model
 	 */
 	bool proccessOnlineOfflineNotification(const LLUUID& session_id, const std::string& utf8_text);
@@ -205,6 +219,11 @@ public:
 
 	void testMessages();
 
+	/**
+	 * Saves an IM message into a file
+	 */
+	bool logToFile(const std::string& session_name, const std::string& from, const LLUUID& from_id, const std::string& utf8_text);
+
 private:
 	
 	/**
@@ -277,11 +296,16 @@ public:
 					  const LLUUID& other_participant_id,
 					  const LLDynamicArray<LLUUID>& ids);
 
-	// Creates a P2P session with the requisite handle for responding to voice calls
+	/**
+	 * Creates a P2P session with the requisite handle for responding to voice calls.
+	 * 
+	 * @param caller_uri - sip URI of caller. It should be always be passed into the method to avoid
+	 * incorrect working of LLVoiceChannel instances. See EXT-2985.
+	 */	
 	LLUUID addP2PSession(const std::string& name,
 					  const LLUUID& other_participant_id,
 					  const std::string& voice_session_handle,
-					  const std::string& caller_uri = LLStringUtil::null);
+					  const std::string& caller_uri);
 
 	/**
 	 * Leave the session with session id. Send leave session notification
@@ -309,9 +333,14 @@ public:
 	// IM received that you haven't seen yet
 	BOOL getIMReceived() const;
 
-	// Calc number of unread IMs
+	// Calc number of all unread IMs
 	S32 getNumberOfUnreadIM();
 
+	/**
+	 * Calculates number of unread IMs from real participants in all stored sessions
+	 */
+	S32 getNumberOfUnreadParticipantMessages();
+
 	// This method is used to go through all active sessions and
 	// disable all of them. This method is usally called when you are
 	// forced to log out or similar situations where you do not have a
@@ -409,7 +438,36 @@ private:
 	LLSD mPendingAgentListUpdates;
 };
 
-class LLIncomingCallDialog : public LLDockableFloater
+class LLCallDialogManager : public LLInitClass<LLCallDialogManager>
+{
+public:
+	LLCallDialogManager();
+	~LLCallDialogManager();
+
+	static void initClass();
+	static void onVoiceChannelChanged(const LLUUID &session_id);
+	static void onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state);
+
+protected:
+	static std::string sPreviousSessionlName;
+	static std::string sCurrentSessionlName;
+	static LLIMModel::LLIMSession* sSession;
+};
+
+class LLCallDialog : public LLDockableFloater
+{
+public:
+	LLCallDialog(const LLSD& payload);
+	~LLCallDialog() {}
+
+	virtual void onOpen(const LLSD& key);
+
+protected:
+	virtual void getAllowedRect(LLRect& rect);
+	LLSD mPayload;
+};
+
+class LLIncomingCallDialog : public LLCallDialog
 {
 public:
 	LLIncomingCallDialog(const LLSD& payload);
@@ -423,12 +481,9 @@ public:
 
 private:
 	void processCallResponse(S32 response);
-	void getAllowedRect(LLRect& rect);
-
-	LLSD mPayload;
 };
 
-class LLOutgoingCallDialog : public LLDockableFloater
+class LLOutgoingCallDialog : public LLCallDialog
 {
 public:
 	LLOutgoingCallDialog(const LLSD& payload);
@@ -439,9 +494,6 @@ public:
 	static void onCancel(void* user_data);
 
 private:
-	void getAllowedRect(LLRect& rect);
-
-	LLSD mPayload;
 };
 
 // Globals