diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 59dec44d02..455e995ed2 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -79,6 +79,17 @@ Value 0 + FSShowMouselookInstructions + + Comment + If true, instructions about leaving Mouseview are displayed. + Persist + 1 + Type + Boolean + Value + 1 + FSLogIMInChatHistory Comment diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a8c949069d..ba981058f9 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/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(); diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index fcefc94d8e..aad90d1742 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -121,13 +121,23 @@ left="30" /> +