From a6c4863a6a14123d59955ad8fb0df82a8ac74faf Mon Sep 17 00:00:00 2001
From: dmitrykproductengine <none@none>
Date: Fri, 13 Sep 2013 13:11:41 +0300
Subject: Build fix after patch for MAINT-3137

---
 indra/newview/llfloaterimsession.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterimsession.h')

diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h
index a0e0171b34..d6718843ca 100755
--- a/indra/newview/llfloaterimsession.h
+++ b/indra/newview/llfloaterimsession.h
@@ -141,7 +141,7 @@ private:
 	/*virtual*/ void refresh();
 
     /*virtual*/ void onTearOffClicked();
-	/*virtual*/ void onClickCloseBtn();
+	/*virtual*/ void onClickCloseBtn(bool app_qutting);
 
 	// Update the window title and input field help text
 	/*virtual*/ void updateSessionName(const std::string& name);
-- 
cgit v1.2.3


From 07c011bc9c3ea2fc8eec6474c7907c9fc44bbef3 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 29 Oct 2013 15:12:39 -0400
Subject: STORM-1975 IM windows occasionally report false typing status.

---
 indra/newview/llfloaterimsession.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llfloaterimsession.h')

diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h
index a0e0171b34..60039b2e57 100755
--- a/indra/newview/llfloaterimsession.h
+++ b/indra/newview/llfloaterimsession.h
@@ -187,6 +187,8 @@ private:
 	LLFrameTimer mTypingTimer;
 	LLFrameTimer mTypingTimeoutTimer;
 	bool mSessionNameUpdatedForTyping;
+	LLFrameTimer mMeTypingTimer;
+	LLFrameTimer mOtherTypingTimer;
 
 	bool mSessionInitialized;
 	LLSD mQueuedMsgsForInit;
@@ -196,6 +198,8 @@ private:
 
 	// connection to voice channel state change signal
 	boost::signals2::connection mVoiceChannelStateChangeConnection;
+
+	const LLIMInfo* mImInfo;
 };
 
 #endif  // LL_FLOATERIMSESSION_H
-- 
cgit v1.2.3