merge.

1 files changed, 7 insertions, 11 deletions

diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 562ee56912..ee0eb13218 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -46,6 +46,7 @@ class LLNotificationChiclet;
 class LLSpeakButton;
 class LLNearbyChatBar;
 class LLIMChiclet;
+class LLBottomTrayLite;
 
 // Build time optimization, generate once in .cpp file
 #ifndef LLBOTTOMTRAY_CPP
@@ -60,13 +61,14 @@ class LLBottomTray
 {
 	LOG_CLASS(LLBottomTray);
 	friend class LLSingleton<LLBottomTray>;
+	friend class LLBottomTrayLite;
 public:
 	~LLBottomTray();
 
 	BOOL postBuild();
 
 	LLChicletPanel*		getChicletPanel()	{return mChicletPanel;}
-	LLNearbyChatBar*		getNearbyChatBar()	{return mNearbyChatBar;}
+	LLNearbyChatBar*		getNearbyChatBar();
 
 	void onCommitGesture(LLUICtrl* ctrl);
 
@@ -79,7 +81,6 @@ public:
 
 	virtual void reshape(S32 width, S32 height, BOOL called_from_parent);
 
-	virtual void onFocusLost();
 	virtual void setVisible(BOOL visible);
 
 	// Implements LLVoiceClientStatusObserver::onChange() to enable the speak
@@ -172,13 +173,6 @@ private:
 	 */
 	void setTrayButtonVisibleIfPossible(EResizeState shown_object_type, bool visible, bool raise_notification = true);
 
-	/**
-	 * Save and restore children shapes.
-	 * Used to avoid the LLLayoutStack resizing logic between mouse look mode switching.
-	 */
-	void savePanelsShape();
-	void restorePanelsShape();
-
 	MASK mResizeState;
 
 	typedef std::map<EResizeState, LLPanel*> state_object_map_t;
@@ -187,8 +181,8 @@ private:
 	typedef std::map<EResizeState, S32> state_object_width_map_t;
 	state_object_width_map_t mObjectDefaultWidthMap;
 
-	typedef std::vector<LLRect> shape_list_t;
-	shape_list_t mSavedShapeList;
+	typedef std::map<EResizeState, LLUICtrl*> dummies_map_t;
+	dummies_map_t mDummiesMap;
 
 protected:
 
@@ -214,6 +208,8 @@ protected:
 	LLPanel*			mGesturePanel;
 	LLButton*			mCamButton;
 	LLButton*			mMovementButton;
+	LLBottomTrayLite*   mBottomTrayLite;
+	bool                mIsInLiteMode;
 };
 
 #endif // LL_LLBOTTOMPANEL_H