From ff449e456a60a0c33ea885bd74e283ce6136ebdc Mon Sep 17 00:00:00 2001
From: Northspring <none@none>
Date: Wed, 19 Aug 2015 15:44:43 +0200
Subject: [PATCH] FIRE-16683: Hide Conversations and Radar floaters when going
 into mouselook as an option

---
 indra/newview/app_settings/settings.xml            | 11 +++++++++++
 indra/newview/llagent.cpp                          | 14 ++++++++++----
 .../default/xui/en/panel_preferences_move.xml      | 10 ++++++++++
 .../default/xui/pl/panel_preferences_move.xml      |  1 +
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 186bece428..610afb40d7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -19937,6 +19937,17 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>FSShowConvoAndRadarInML</key>
+  <map>
+    <key>Comment</key>
+    <string>Conversations and Radar windows stays visible when entering mouselook if it was open already.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>FSAnnounceIncomingIM</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 331b013229..72337348ed 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2415,8 +2415,11 @@ void LLAgent::endAnimationUpdateUI()
 			}
 			// </FS:LO>
 			// <FS:Ansariel> Skip restoring conversations and radar floater
-			skip_list.insert(LLFloaterReg::findInstance("fs_radar"));
-			skip_list.insert(LLFloaterReg::findInstance("fs_im_container"));
+			if (gSavedSettings.getBOOL("FSShowConvoAndRadarInML"))
+			{
+				skip_list.insert(LLFloaterReg::findInstance("fs_radar"));
+				skip_list.insert(LLFloaterReg::findInstance("fs_im_container"));
+			}
 			// </FS:Ansariel>
 
 			// <FS:Ansariel> [FS communication UI] Commented out so far.
@@ -2584,8 +2587,11 @@ void LLAgent::endAnimationUpdateUI()
 		}
 		// </FS:LO>
 		// <FS:Ansariel> Skip hiding conversations and radar floater
-		skip_list.insert(LLFloaterReg::findInstance("fs_radar"));
-		skip_list.insert(LLFloaterReg::findInstance("fs_im_container"));
+		if (gSavedSettings.getBOOL("FSShowConvoAndRadarInML"))
+		{
+			skip_list.insert(LLFloaterReg::findInstance("fs_radar"));
+			skip_list.insert(LLFloaterReg::findInstance("fs_im_container"));
+		}
 		// </FS:Ansariel>
 		gFloaterView->pushVisibleAll(FALSE, skip_list);
 #endif
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 bc1af80b89..f15ac86642 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -330,6 +330,16 @@
          name="first_person_ui_visible"
          top_pad="5"
          width="256" />
+        <check_box
+         control_name="FSShowConvoAndRadarInML"
+         follows="left|top"
+         enabled_control="EnableMouselook"
+         height="16"
+         label="Show Conversations and Radar windows in Mouselook"
+         layout="topleft"
+         name="FSShowConvoAndRadarInML"
+         top_pad="5"
+         width="256" />
         <check_box
          control_name="FSEnableRightclickMenuInMouselook"
          follows="left|top"
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
index bd1e3e14cc..8fc41671b5 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
@@ -30,6 +30,7 @@
 			<check_box label="Włącz funkcjonalność widoku pierwszoosobowego" name="EnableMouselook" tool_tip="Zezwól przeglądarce na używanie perspektywy pierwszej osoby oraz sterowanie w niej kamerą za pomocą myszy"/>
 			<check_box label="Awatar widoczny w trybie pierwszoosobowym" name="first_person_avatar_visible"/>
 			<check_box label="Interfejs widoczny w trybie pierwszoosobowym" name="first_person_ui_visible"/>
+			<check_box label="Rozmowy i Radar widoczne w trybie pierwszoosobowym" name="FSShowConvoAndRadarInML"/>
 			<check_box label="Menu kontekstowe widoczne w trybie pierwszoosobowym" tool_tip="Otwieraj menu kołowe/kontekstowe w trybie pierwszoosobowym po przytrzymaniu klawisza ALT i kliknięciu prawym przyciskiem myszki" name="FSEnableRightclickMenuInMouselook"/>
 			<check_box label="Zezwól na opuszczanie trybu pierwszoosobowego za pomocą kółka myszy" name="FSScrollWheelExitsMouselook" tool_tip="Zezwól na opuszczanie trybu pierwszoosobowego za pomocą kółka myszy"/>
 			<check_box label="Pokazuj instrukcje trybu pierwszoosobowego" name="mouselook_instructions_visible" tool_tip="Pokazuj instrukcje w trybie pierwszoosobowym"/>