1 files changed, 112 insertions, 83 deletions

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index bd68d52868..93b708f299 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -62,6 +62,47 @@ namespace
 	const std::string& PANEL_GESTURE_NAME	= "gesture_panel";
 }
 
+class LLBottomTrayLite
+	: public LLPanel
+{
+public:
+	LLBottomTrayLite()
+		: mNearbyChatBar(NULL),
+		  mGesturePanel(NULL)
+	{
+		mFactoryMap["chat_bar"] = LLCallbackMap(LLBottomTray::createNearbyChatBar, NULL);
+		LLUICtrlFactory::getInstance()->buildPanel(this, "panel_bottomtray_lite.xml");
+		// Necessary for focus movement among child controls
+		setFocusRoot(TRUE);
+	}
+
+	BOOL postBuild()
+	{
+		mNearbyChatBar = getChild<LLNearbyChatBar>("chat_bar");
+		mGesturePanel = getChild<LLPanel>("gesture_panel");
+
+		// Hide "show_nearby_chat" button 
+		LLLineEditor* chat_box = mNearbyChatBar->getChatBox();
+		LLUICtrl* show_btn = mNearbyChatBar->getChild<LLUICtrl>("show_nearby_chat");
+		S32 delta_width = show_btn->getRect().getWidth();
+		show_btn->setVisible(FALSE);
+		chat_box->reshape(chat_box->getRect().getWidth() + delta_width, chat_box->getRect().getHeight());
+
+		return TRUE;
+	}
+
+	void onFocusLost()
+	{
+		if (gAgent.cameraMouselook())
+		{
+			LLBottomTray::getInstance()->setVisible(FALSE);
+		}
+	}
+
+	LLNearbyChatBar*	mNearbyChatBar;
+	LLPanel*			mGesturePanel;
+};
+
 LLBottomTray::LLBottomTray(const LLSD&)
 :	mChicletPanel(NULL),
 	mSpeakPanel(NULL),
@@ -76,6 +117,8 @@ LLBottomTray::LLBottomTray(const LLSD&)
 ,	mSnapshotPanel(NULL)
 ,	mGesturePanel(NULL)
 ,	mCamButton(NULL)
+,	mBottomTrayLite(NULL)
+,	mIsInLiteMode(false)
 {
 	// Firstly add ourself to IMSession observers, so we catch session events
 	// before chiclets do that.
@@ -100,6 +143,12 @@ LLBottomTray::LLBottomTray(const LLSD&)
 
 	// Necessary for focus movement among child controls
 	setFocusRoot(TRUE);
+
+	{
+		mBottomTrayLite = new LLBottomTrayLite();
+		mBottomTrayLite->setFollowsAll();
+		mBottomTrayLite->setVisible(FALSE);
+	}
 }
 
 LLBottomTray::~LLBottomTray()
@@ -134,6 +183,11 @@ void* LLBottomTray::createNearbyChatBar(void* userdata)
 	return new LLNearbyChatBar();
 }
 
+LLNearbyChatBar* LLBottomTray::getNearbyChatBar()
+{
+	return mIsInLiteMode ? mBottomTrayLite->mNearbyChatBar : mNearbyChatBar;
+}
+
 LLIMChiclet* LLBottomTray::createIMChiclet(const LLUUID& session_id)
 {
 	LLIMChiclet::EType im_chiclet_type = LLIMChiclet::getIMSessionType(session_id);
@@ -234,71 +288,36 @@ void LLBottomTray::onChange(EStatusType status, const std::string &channelURI, b
 		break;
 	}
 
-	mSpeakBtn->setEnabled(enable);
-}
-
-//virtual
-void LLBottomTray::onFocusLost()
-{
-	if (gAgent.cameraMouselook())
-	{
-		setVisible(FALSE);
-	}
-}
-
-void LLBottomTray::savePanelsShape()
-{
-	mSavedShapeList.clear();
-	for (child_list_const_iter_t
-			 child_it = mToolbarStack->beginChild(),
-			 child_it_end = mToolbarStack->endChild();
-		 child_it != child_it_end; ++child_it)
-	{
-		mSavedShapeList.push_back( (*child_it)->getRect() );
-	}
-}
-
-void LLBottomTray::restorePanelsShape()
-{
-	if (mSavedShapeList.size() != mToolbarStack->getChildCount())
-		return;
-	int i = 0;
-	for (child_list_const_iter_t
-			 child_it = mToolbarStack->beginChild(),
-			 child_it_end = mToolbarStack->endChild();
-		 child_it != child_it_end; ++child_it)
+	// We have to enable/disable right and left parts of speak button separately (EXT-4648)
+	mSpeakBtn->setSpeakBtnEnabled(enable);
+	// skipped to avoid button blinking
+	if (status != STATUS_JOINING && status!= STATUS_LEFT_CHANNEL)
 	{
-		(*child_it)->setShape(mSavedShapeList[i++]);
+		mSpeakBtn->setFlyoutBtnEnabled(LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking());
 	}
 }
 
 void LLBottomTray::onMouselookModeOut()
 {
-	// Apply the saved settings when we are not in mouselook mode, see EXT-3988.
-	{
-		setTrayButtonVisibleIfPossible (RS_BUTTON_GESTURES, gSavedSettings.getBOOL("ShowGestureButton"), false);
-		setTrayButtonVisibleIfPossible (RS_BUTTON_MOVEMENT, gSavedSettings.getBOOL("ShowMoveButton"),    false);
-		setTrayButtonVisibleIfPossible (RS_BUTTON_CAMERA,   gSavedSettings.getBOOL("ShowCameraButton"),  false);
-		setTrayButtonVisibleIfPossible (RS_BUTTON_SNAPSHOT, gSavedSettings.getBOOL("ShowSnapshotButton"),false);
-	}
-	// HACK: To avoid usage the LLLayoutStack logic of resizing, we force the updateLayout
-	// and then restore children saved shapes. See EXT-4309.
-	BOOL saved_anim = mToolbarStack->getAnimate();
-	mToolbarStack->updatePanelAutoResize(PANEL_CHATBAR_NAME, FALSE);
-	// Disable animation to prevent layout updating in several frames.
-	mToolbarStack->setAnimate(FALSE);
-	// Force the updating of layout to reset panels collapse factor.
-	mToolbarStack->updateLayout();
-	// Restore animate state.
-	mToolbarStack->setAnimate(saved_anim);
-	// Restore saved shapes.
-	restorePanelsShape();
+	mIsInLiteMode = false;
+	mBottomTrayLite->setVisible(FALSE);
+	mNearbyChatBar->getChatBox()->setText(mBottomTrayLite->mNearbyChatBar->getChatBox()->getText());
+	setVisible(TRUE);
 }
 
 void LLBottomTray::onMouselookModeIn()
 {
-	savePanelsShape();
-	mToolbarStack->updatePanelAutoResize(PANEL_CHATBAR_NAME, TRUE);
+	setVisible(FALSE);
+
+	// Attach the lite bottom tray
+	if (getParent() && mBottomTrayLite->getParent() != getParent())
+		getParent()->addChild(mBottomTrayLite);
+
+	mBottomTrayLite->setShape(getLocalRect());
+	mBottomTrayLite->mNearbyChatBar->getChatBox()->setText(mNearbyChatBar->getChatBox()->getText());
+	mBottomTrayLite->mGesturePanel->setVisible(gSavedSettings.getBOOL("ShowGestureButton"));
+
+	mIsInLiteMode = true;
 }
 
 //virtual
@@ -306,31 +325,14 @@ void LLBottomTray::onMouselookModeIn()
 // If bottom tray is already visible in mouselook mode, then onVisibilityChange will not be called from setVisible(true),
 void LLBottomTray::setVisible(BOOL visible)
 {
-	LLPanel::setVisible(visible);
-
-	// *NOTE: we must check mToolbarStack against NULL because setVisible is called from the 
-	// LLPanel::initFromParams BEFORE postBuild is called and child controls are not exist yet
-	if (NULL != mToolbarStack)
+	if (mIsInLiteMode)
 	{
-		BOOL visibility = gAgent.cameraMouselook() ? false : true;
-
-		for ( child_list_const_iter_t child_it = mToolbarStack->getChildList()->begin(); 
-			child_it != mToolbarStack->getChildList()->end(); child_it++)
-		{
-			LLView* viewp = *child_it;
-			std::string name = viewp->getName();
-
-			// Chat bar and gesture button are shown even in mouselook mode.
-			// But the move, camera and snapshot buttons shouldn't be displayed. See EXT-3988.
-			if ("chat_bar" == name || "gesture_panel" == name || (visibility && ("movement_panel" == name || "cam_panel" == name || "snapshot_panel" == name)))
-				continue;
-			else 
-			{
-				viewp->setVisible(visibility);
-			}
-		}
+		mBottomTrayLite->setVisible(visible);
+	}
+	else
+	{
+		LLPanel::setVisible(visible);
 	}
-
 	if(visible)
 		gFloaterView->setSnapOffsetBottom(getRect().getHeight());
 	else
@@ -422,9 +424,10 @@ BOOL LLBottomTray::postBuild()
 	mSpeakPanel = getChild<LLPanel>("speak_panel");
 	mSpeakBtn = getChild<LLSpeakButton>("talk");
 
-	// Speak button should be initially disabled because
+	// Both parts of speak button should be initially disabled because
 	// it takes some time between logging in to world and connecting to voice channel.
-	mSpeakBtn->setEnabled(FALSE);
+	mSpeakBtn->setSpeakBtnEnabled(false);
+	mSpeakBtn->setFlyoutBtnEnabled(false);
 
 	// Localization tool doesn't understand custom buttons like <talk_button>
 	mSpeakBtn->setSpeakToolTip( getString("SpeakBtnToolTip") );
@@ -438,6 +441,8 @@ BOOL LLBottomTray::postBuild()
 	mObjectDefaultWidthMap[RS_BUTTON_CAMERA]   = mCamPanel->getRect().getWidth();
 	mObjectDefaultWidthMap[RS_BUTTON_SPEAK]	   = mSpeakPanel->getRect().getWidth();
 
+	mNearbyChatBar->getChatBox()->setContextMenu(NULL);
+
 	return TRUE;
 }
 
@@ -486,6 +491,7 @@ void LLBottomTray::onContextMenuItemClicked(const LLSD& userdata)
 	else if (item == "paste")
 	{
 		edit_box->paste();
+		edit_box->setFocus(TRUE);
 	}
 	else if (item == "delete")
 	{
@@ -535,7 +541,18 @@ void LLBottomTray::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 	if (mChicletPanel && mToolbarStack && mNearbyChatBar)
 	{
-		mToolbarStack->updatePanelAutoResize(PANEL_CHICLET_NAME, TRUE);
+		// Firstly, update layout stack to ensure we deal with correct panel sizes.
+		{
+			BOOL saved_anim = mToolbarStack->getAnimate();
+			// Set chiclet panel to be autoresized by default.
+			mToolbarStack->updatePanelAutoResize(PANEL_CHICLET_NAME, TRUE);
+			// Disable animation to prevent layout updating in several frames.
+			mToolbarStack->setAnimate(FALSE);
+			// Force the updating of layout to reset panels collapse factor.
+			mToolbarStack->updateLayout();
+			// Restore animate state.
+			mToolbarStack->setAnimate(saved_anim);
+		}
 
 		// bottom tray is narrowed
 		if (delta_width < 0)
@@ -637,7 +654,7 @@ S32 LLBottomTray::processWidthDecreased(S32 delta_width)
 
 		mNearbyChatBar->reshape(mNearbyChatBar->getRect().getWidth() - delta_panel, mNearbyChatBar->getRect().getHeight());
 
-		log(mChicletPanel, "after processing panel decreasing via nearby chatbar panel");
+		log(mNearbyChatBar, "after processing panel decreasing via nearby chatbar panel");
 
 		lldebugs << "RS_CHATBAR_INPUT"
 			<< ", delta_panel: " << delta_panel
@@ -1057,6 +1074,11 @@ void LLBottomTray::initStateProcessedObjectMap()
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_MOVEMENT, mMovementPanel));
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_CAMERA, mCamPanel));
 	mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_SNAPSHOT, mSnapshotPanel));
+
+	mDummiesMap.insert(std::make_pair(RS_BUTTON_GESTURES, getChild<LLUICtrl>("after_gesture_panel")));
+	mDummiesMap.insert(std::make_pair(RS_BUTTON_MOVEMENT, getChild<LLUICtrl>("after_movement_panel")));
+	mDummiesMap.insert(std::make_pair(RS_BUTTON_CAMERA,   getChild<LLUICtrl>("after_cam_panel")));
+	mDummiesMap.insert(std::make_pair(RS_BUTTON_SPEAK,    getChild<LLUICtrl>("after_speak_panel")));
 }
 
 void LLBottomTray::setTrayButtonVisible(EResizeState shown_object_type, bool visible)
@@ -1069,6 +1091,11 @@ void LLBottomTray::setTrayButtonVisible(EResizeState shown_object_type, bool vis
 	}
 
 	panel->setVisible(visible);
+
+	if (mDummiesMap.count(shown_object_type))
+	{
+		mDummiesMap[shown_object_type]->setVisible(visible);
+	}
 }
 
 void LLBottomTray::setTrayButtonVisibleIfPossible(EResizeState shown_object_type, bool visible, bool raise_notification)
@@ -1084,6 +1111,8 @@ void LLBottomTray::setTrayButtonVisibleIfPossible(EResizeState shown_object_type
 			return;
 		}
 
+		const S32 dummy_width = mDummiesMap.count(shown_object_type) ? mDummiesMap[shown_object_type]->getRect().getWidth() : 0;
+
 		const S32 chatbar_panel_width = mNearbyChatBar->getRect().getWidth();
 		const S32 chatbar_panel_min_width = mNearbyChatBar->getMinWidth();
 
@@ -1093,7 +1122,7 @@ void LLBottomTray::setTrayButtonVisibleIfPossible(EResizeState shown_object_type
 		const S32 available_width = (chatbar_panel_width - chatbar_panel_min_width)
 			+ (chiclet_panel_width - chiclet_panel_min_width);
 
-		const S32 required_width = panel->getRect().getWidth();
+		const S32 required_width = panel->getRect().getWidth() + dummy_width;
 		can_be_set = available_width >= required_width;
 	}