Merge

1 files changed, 6 insertions, 2 deletions

diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 302d5a8066..e7b05a584b 100755
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -171,8 +171,7 @@ protected:
 	LLFolderView* mConversationsRoot;
 	LLScrollContainer* mScroller;
 
-    LLOutputMonitorCtrl* mSpeakingIndicator;
-	LLChatHistory* mChatHistory;
+    LLChatHistory* mChatHistory;
 	LLChatEntry* mInputEditor;
 	LLLayoutPanel * mChatLayoutPanel;
 	LLLayoutStack * mInputPanels;
@@ -182,6 +181,9 @@ protected:
 	LLButton* mTearOffBtn;
 	LLButton* mCloseBtn;
 	LLButton* mGearBtn;
+	LLButton* mAddBtn;
+    LLButton* mVoiceButton;
+    LLUICtrl* mTranslationCheckBox;
 
 private:
 	// Handling selection and contextual menu
@@ -201,6 +203,8 @@ private:
 	 */
 	void reshapeChatLayoutPanel();
 
+	void onInputEditorClicked();
+
 	bool checkIfTornOff();
     bool mIsHostAttached;
     bool mHasVisibleBeenInitialized;