FIRE-513, Options to remove "Press ESC to exit..." onscreen text while in mouselook. Patch by Selo Jacobus

indra/newview/app_settings/settings.xml

@@ -79,6 +79,17 @@
 		<key>Value</key>
 		<integer>0</integer>
 	</map>
+  <key>FSShowMouselookInstructions</key>
+  <map>
+    <key>Comment</key>
+    <string>If true, instructions about leaving Mouseview are displayed.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
 	<key>FSLogIMInChatHistory</key>
 	<map>
 		<key>Comment</key>

indra/newview/llviewerwindow.cpp

@@ -2185,8 +2185,8 @@ void LLViewerWindow::draw()
 
 		// Draw tool specific overlay on world
 		LLToolMgr::getInstance()->getCurrentTool()->draw();
-
-		if( gAgentCamera.cameraMouselook() || LLFloaterCamera::inFreeCameraMode() )
+        // Only show Mouselookinstructions if FSShowMouselookInstruction is TRUE
+		if( gSavedSettings.getBOOL("FSShowMouselookInstructions") && (gAgentCamera.cameraMouselook() || LLFloaterCamera::inFreeCameraMode()) )
 		{
 			drawMouselookInstructions();
 			stop_glerror();

indra/newview/skins/default/xui/en/panel_preferences_move.xml

@@ -121,13 +121,23 @@
    left="30" />
   <check_box
    control_name="FirstPersonAvatarVisible"
-   follows="left|top"
+   follows="top"
    height="20"
    label="Show avatar in Mouselook"
    layout="topleft"
    left_pad="30"
    name="first_person_avatar_visible"
    width="256" />
+  <check_box
+ control_name="FSShowMouselookInstructions"
+ follows="left|top"
+ height="16"
+ initial_value="true"
+ label="Show Mouselook instructions"
+ layout="topleft"
+ name="mouselook_instructions_visible"
+ tool_tip="Show Mouselook Instructions"
+ width="256" />
   <text
    type="string"
    length="1"