merge changes for DRTVWR-306

1 files changed, 6 insertions, 5 deletions

diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index c7e73bd70d..302d5a8066 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -175,17 +175,14 @@ protected:
 	LLChatHistory* mChatHistory;
 	LLChatEntry* mInputEditor;
 	LLLayoutPanel * mChatLayoutPanel;
-	int mInputEditorPad; // padding between input field and chat history
-
+	LLLayoutStack * mInputPanels;
+	
 	LLButton* mExpandCollapseLineBtn;
 	LLButton* mExpandCollapseBtn;
 	LLButton* mTearOffBtn;
 	LLButton* mCloseBtn;
 	LLButton* mGearBtn;
 
-	S32 mFloaterHeight;
-
-
 private:
 	// Handling selection and contextual menu
     void doToSelected(const LLSD& userdata);
@@ -209,6 +206,10 @@ private:
     bool mHasVisibleBeenInitialized;
 
 	LLTimer* mRefreshTimer; ///< Defines the rate at which refresh() is called.
+
+	S32 mInputEditorPad;
+	S32 mChatLayoutPanelHeight;
+	S32 mFloaterHeight;
 };