merge

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index ee0eb13218..18c14e5e19 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -94,6 +94,9 @@ public:
 	void showCameraButton(BOOL visible);
 	void showSnapshotButton(BOOL visible);
 
+	void toggleMovementControls();
+	void toggleCameraControls();
+
 	void onMouselookModeIn();
 	void onMouselookModeOut();
 
@@ -173,6 +176,14 @@ private:
 	 */
 	void setTrayButtonVisibleIfPossible(EResizeState shown_object_type, bool visible, bool raise_notification = true);
 
+	/**
+	 * Sets passed visibility to required button and fit widths of shown
+	 * buttons(notice that method can shrink widths to
+	 * allocate needed room in bottom tray).
+	 * Returns true if visibility of required button was set.
+	 */
+	bool setVisibleAndFitWidths(EResizeState object_type, bool visible);
+
 	MASK mResizeState;
 
 	typedef std::map<EResizeState, LLPanel*> state_object_map_t;