automated merge PE->viewer2.0

1 files changed, 15 insertions, 2 deletions

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 976b312509..beccefa430 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -161,6 +161,9 @@ void LLBottomTray::sessionAdded(const LLUUID& session_id, const std::string& nam
 	{
 		chiclet->setIMSessionName(name);
 		chiclet->setOtherParticipantId(other_participant_id);
+		
+		LLIMFloater::onIMChicletCreated(session_id);
+
 	}
 	else
 	{
@@ -251,14 +254,24 @@ void LLBottomTray::setVisible(BOOL visible)
 		{
 			LLView* viewp = *child_it;
 			std::string name = viewp->getName();
-			
-			if ("chat_bar" == name || "movement_panel" == name || "cam_panel" == name || "snapshot_panel" == name || "gesture_panel" == name)
+
+			// 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);
 			}
 		}
+
+		// Apply the saved settings when we are not in mouselook mode, see EXT-3988.
+		if (visibility)
+		{
+			showCameraButton(gSavedSettings.getBOOL("ShowCameraButton"));
+			showSnapshotButton(gSavedSettings.getBOOL("ShowSnapshotButton"));
+			showMoveButton(gSavedSettings.getBOOL("ShowMoveButton"));
+			showGestureButton(gSavedSettings.getBOOL("ShowGestureButton"));
+		}
 	}
 }