merge

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h
index f9dd8b9b85..f1e68a2b3d 100644
--- a/indra/newview/llimfloater.h
+++ b/indra/newview/llimfloater.h
@@ -50,6 +50,7 @@ class LLInventoryCategory;
  */
 class LLIMFloater : public LLTransientDockableFloater
 {
+	LOG_CLASS(LLIMFloater);
 public:
 	LLIMFloater(const LLUUID& session_id);
 
@@ -120,6 +121,10 @@ public:
 
 	virtual LLTransientFloaterMgr::ETransientGroup getGroup() { return LLTransientFloaterMgr::IM; }
 
+protected:
+	/* virtual */
+	void	onClickCloseBtn();
+
 private:
 	// process focus events to set a currently active session
 	/* virtual */ void onFocusLost();
@@ -150,6 +155,12 @@ private:
 
 	static void closeHiddenIMToasts();
 
+	static bool resetAllowedRectPadding(const LLSD& newvalue);
+	//need to keep this static for performance issues
+	static S32 sAllowedRectRightPadding;
+
+	static void confirmLeaveCallCallback(const LLSD& notification, const LLSD& response);
+
 	LLPanelChatControlPanel* mControlPanel;
 	LLUUID mSessionID;
 	S32 mLastMessageIndex;