From 66aaf3bdfe61d727f0ba8e3f61a8be49bcfc29de Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Tue, 7 Jun 2011 13:51:10 +0200
Subject: [PATCH] Moved camera options to View sub panel, removed redundant
 camera constraints setting, added Minimap rotation option FIRE-1214

---
 .../xui/en/panel_preferences_firestorm.xml    | 178 +++++++++---------
 1 file changed, 93 insertions(+), 85 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index 2ca71ec050..751e7fad72 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -204,7 +204,7 @@
          value="4" />
 	  </combo_box>
 	  
-        <check_box bottom_delta="-20"
+        <check_box bottom_delta="-30"
       follows="left|top"
       font="SansSerifSmall"
       height="16"
@@ -235,91 +235,99 @@
       function="FS.ToggleSortContacts" />
       </check_box>
 
-     <text
-     top_pad="10"
-     type="string"
-     length="1"
-     follows="left|top"
-     height="15"
-     layout="topleft"
-     left="15"
-     name="lookatshownames"
-     width="200">
-        Camera options:
-    </text>
-
-    <check_box bottom_delta="-20"
-     follows="left|top"
-     font="SansSerifSmall"
-     height="16"
-     initial_value="false"
-     label="Disable camera constraints"
-     left="15"
-     mouse_opaque="true"
-     name="disablecameraconstraints"
-     radio_style="false"
-     width="270"
-     control_name="DisableCameraConstraints"
-     tool_tip="Disable the normal bounds put on the camera by avatar position."/>
-
-    <check_box bottom_delta="-20"
-     follows="left|top"
-     font="SansSerifSmall"
-     height="16"
-     initial_value="false"
-     label="Clicking your avatar keeps camera position"
-     left="15"
-     mouse_opaque="true"
-     name="backwardsturnavatar"
-     radio_style="false"
-     width="270"
-     control_name="ClickOnAvatarKeepsCamera"
-     tool_tip="Normally, clicking on your avatar resets the camera position. This option removes this behavior."/>
-
-    <check_box bottom_delta="-20"
-     follows="left|top"
-     font="SansSerifSmall"
-     height="16"
-     initial_value="false"
-     label="Disable minimum camera zoom distance"
-     left="15"
-     mouse_opaque="true"
-     name="disableminzoomdist"
-     radio_style="false"
-     width="270"
-     control_name="PhoenixDisableMinZoomDist"
-     tool_tip="Disable the constraint on the closest distance the camera is allowed to get to an object."/>
-
-    <check_box bottom_delta="-20"
-     follows="left|top"
-     font="SansSerifSmall"
-     height="16"
-     initial_value="false"
-     label="Allow the camera to move without constraints through prims"
-     left="15"
-     mouse_opaque="true"
-     name="ignorecameraconstraints"
-     radio_style="false"
-     width="350"
-     control_name="PhoenixIgnoreSimulatorCameraConstraints"
-     tool_tip="Ignores the 'push' the simulator applies to your camera to keep it out of objects."/>
-
-    <text
-     name="requires_restart_label"
-     follows="left|top"
-     layout="topleft"
-     left_pad="10"
-     top_delta="0"
-     height="20"
-     width="130"
-     text_color="White_25">
-         (requires restart)
-    </text>
-
       </panel>
-	  
-	  
-	   <!--Chat-->
+
+	  <!--View-->
+		<panel
+			border="true"
+			follows="all"
+			height="500"
+			label="View"
+			layout="topleft"
+			left="1"
+			name="firestorm_view"
+			width="517">
+
+		<text
+			top_pad="10"
+			type="string"
+			length="1"
+			follows="left|top"
+			height="15"
+			layout="topleft"
+			left="15"
+			name="camera_options_label"
+			width="200">
+			Camera options:
+		</text>
+
+		<check_box top_pad="4"
+			follows="left|top"
+			font="SansSerifSmall"
+			height="16"
+			initial_value="false"
+			label="Clicking your avatar keeps camera position"
+			layout="topleft"
+			left="30"
+			name="backwardsturnavatar"
+			width="270"
+			control_name="ClickOnAvatarKeepsCamera"
+			tool_tip="Normally, clicking on your avatar resets the camera position. This option removes this behavior."/>
+
+		<check_box top_pad="4"
+			follows="left|top"
+			font="SansSerifSmall"
+			height="16"
+			initial_value="false"
+			label="Disable minimum camera zoom distance"
+			layout="topleft"
+			left="30"
+			name="disableminzoomdist"
+			width="270"
+			control_name="PhoenixDisableMinZoomDist"
+			tool_tip="Disable the constraint on the closest distance the camera is allowed to get to an object."/>
+
+		<check_box top_pad="4"
+			follows="left|top"
+			font="SansSerifSmall"
+			height="16"
+			initial_value="false"
+			label="Allow the camera to move without constraints through prims"
+			layout="topleft"
+			left="30"
+			name="ignorecameraconstraints"
+			width="350"
+			control_name="PhoenixIgnoreSimulatorCameraConstraints"
+			tool_tip="Ignores the 'push' the simulator applies to your camera to keep it out of objects."/>
+
+		<text
+			name="requires_restart_label"
+			follows="left|top"
+			layout="topleft"
+			left_pad="10"
+			top_delta="0"
+			height="20"
+			width="130"
+			text_color="White_25">
+			(requires restart)
+		</text>
+
+		<check_box top_pad="12"
+			follows="left|top"
+			font="SansSerifSmall"
+			height="16"
+			initial_value="false"
+			label="Enable Minimap rotation"
+			layout="topleft"
+			left="15"
+			name="minimaprotate"
+			width="350"
+			control_name="MiniMapRotate"
+			tool_tip="Rotate miniature world map to avatar direction."/>
+
+	  </panel>
+
+	  <!--Chat-->
       <panel
 	    border="true"
         bottom="-500"