From 6a886401608dd8b3ca6f656ec9c288eb6761761a Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <none@none>
Date: Wed, 9 Jan 2013 11:25:15 +0100
Subject: [PATCH] FSResetCameraOnMovement checkboxes in Phototools also for
 Starlight skins

---
 .../starlight/xui/en/floater_phototools.xml   | 21 ++++++++++++++-----
 .../xui/en/floater_phototools_camera.xml      | 19 +++++++++++++----
 .../xui/en/floater_phototools.xml             | 21 ++++++++++++++-----
 .../xui/en/floater_phototools_camera.xml      | 19 +++++++++++++----
 4 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/indra/newview/skins/starlight/xui/en/floater_phototools.xml b/indra/newview/skins/starlight/xui/en/floater_phototools.xml
index 4f42caffbd..8454464f03 100644
--- a/indra/newview/skins/starlight/xui/en/floater_phototools.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_phototools.xml
@@ -4567,12 +4567,12 @@
 						 bg_alpha_color="DkGray_66"
 						 background_visible="true">
 							<check_box
-							 top_pad="15"
+							 top_pad="7"
 							 follows="left|top"
 							 height="16"
 							 label="Clicking your avatar keeps camera position"
 							 layout="topleft"
-							 left="10"
+							 left="5"
 							 name="clickonavatarkeepscamera"
 							 width="250"
 							 control_name="ClickOnAvatarKeepsCamera"
@@ -4583,7 +4583,7 @@
 							 height="16"
 							 label="Reset camera position after teleport"
 							 layout="topleft"
-							 left="10"
+							 left="5"
 							 name="FSResetCameraOnTP"
 							 width="250"
 							 control_name="FSResetCameraOnTP"
@@ -4594,7 +4594,7 @@
 							 height="16"
 							 label="Disable minimum camera zoom distance"
 							 layout="topleft"
-							 left="10"
+							 left="5"
 							 name="disableminzoomdist"
 							 width="250"
 							 control_name="FSDisableMinZoomDist"
@@ -4605,11 +4605,22 @@
 							 height="16"
 							 label="Allow the camera to move w/o constraints"
 							 layout="topleft"
-							 left="10"
+							 left="5"
 							 name="ignorecameraconstraints"
 							 width="250"
 							 control_name="FSIgnoreSimulatorCameraConstraints"
 							 tool_tip="Ignores the 'push' the simulator applies to your camera to keep it out of objects. REQUIRES RESTART!"/>
+							<check_box
+							 top_pad="2"
+							 follows="left|top"
+							 height="16"
+							 label="Reset camera position on avatar movement"
+							 layout="topleft"
+							 left="5"
+							 name="resetcamerapositiononmovement"
+							 width="250"
+							 control_name="FSResetCameraOnMovement"
+							 tool_tip="Resets the camera to its default position when you move the avatar"/>
 						</panel>
 					</panel>
 				</tab_container>
diff --git a/indra/newview/skins/starlight/xui/en/floater_phototools_camera.xml b/indra/newview/skins/starlight/xui/en/floater_phototools_camera.xml
index b07dd3f1d5..dcb0254157 100644
--- a/indra/newview/skins/starlight/xui/en/floater_phototools_camera.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_phototools_camera.xml
@@ -710,7 +710,7 @@
 				 height="16"
 				 label="Clicking your avatar keeps camera position"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="clickonavatarkeepscamera"
 				 width="250"
 				 control_name="ClickOnAvatarKeepsCamera"
@@ -721,7 +721,7 @@
 				 height="16"
 				 label="Reset camera position after teleport"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="FSResetCameraOnTP"
 				 width="250"
 				 control_name="FSResetCameraOnTP"
@@ -732,7 +732,7 @@
 				 height="16"
 				 label="Disable minimum camera zoom distance"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="disableminzoomdist"
 				 width="250"
 				 control_name="FSDisableMinZoomDist"
@@ -743,11 +743,22 @@
 				 height="16"
 				 label="Allow the camera to move w/o constraints"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="ignorecameraconstraints"
 				 width="250"
 				 control_name="FSIgnoreSimulatorCameraConstraints"
 				 tool_tip="Ignores the 'push' the simulator applies to your camera to keep it out of objects. REQUIRES RESTART!"/>
+				<check_box
+				 top_pad="5"
+				 follows="left|top"
+				 height="16"
+				 label="Reset camera position on avatar movement"
+				 layout="topleft"
+				 left="5"
+				 name="resetcameraonmovement"
+				 width="250"
+				 control_name="FSResetCameraOnMovement"
+				 tool_tip="Resets the camera to its default position when you move the avatar"/>
 			</panel>
 		</panel>
 
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml b/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml
index 0ce896d6f8..18c8d39f8d 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml
@@ -4567,12 +4567,12 @@
 						 bg_alpha_color="SL-CustomBackground_Light"
 						 background_visible="true">
 							<check_box
-							 top_pad="15"
+							 top_pad="7"
 							 follows="left|top"
 							 height="16"
 							 label="Clicking your avatar keeps camera position"
 							 layout="topleft"
-							 left="10"
+							 left="5"
 							 name="clickonavatarkeepscamera"
 							 width="250"
 							 control_name="ClickOnAvatarKeepsCamera"
@@ -4583,7 +4583,7 @@
 							 height="16"
 							 label="Reset camera position after teleport"
 							 layout="topleft"
-							 left="10"
+							 left="5"
 							 name="FSResetCameraOnTP"
 							 width="250"
 							 control_name="FSResetCameraOnTP"
@@ -4594,7 +4594,7 @@
 							 height="16"
 							 label="Disable minimum camera zoom distance"
 							 layout="topleft"
-							 left="10"
+							 left="5"
 							 name="disableminzoomdist"
 							 width="250"
 							 control_name="FSDisableMinZoomDist"
@@ -4605,11 +4605,22 @@
 							 height="16"
 							 label="Allow the camera to move w/o constraints"
 							 layout="topleft"
-							 left="10"
+							 left="5"
 							 name="ignorecameraconstraints"
 							 width="250"
 							 control_name="FSIgnoreSimulatorCameraConstraints"
 							 tool_tip="Ignores the 'push' the simulator applies to your camera to keep it out of objects. REQUIRES RESTART!"/>
+							<check_box
+							 top_pad="2"
+							 follows="left|top"
+							 height="16"
+							 label="Reset camera position on avatar movement"
+							 layout="topleft"
+							 left="5"
+							 name="resetcamerapositiononmovement"
+							 width="250"
+							 control_name="FSResetCameraOnMovement"
+							 tool_tip="Resets the camera to its default position when you move the avatar"/>
 						</panel>
 					</panel>
 				</tab_container>
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_phototools_camera.xml b/indra/newview/skins/starlightcui/xui/en/floater_phototools_camera.xml
index d36963971b..a904b61aa2 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_phototools_camera.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_phototools_camera.xml
@@ -710,7 +710,7 @@
 				 height="16"
 				 label="Clicking your avatar keeps camera position"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="clickonavatarkeepscamera"
 				 width="250"
 				 control_name="ClickOnAvatarKeepsCamera"
@@ -721,7 +721,7 @@
 				 height="16"
 				 label="Reset camera position after teleport"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="FSResetCameraOnTP"
 				 width="250"
 				 control_name="FSResetCameraOnTP"
@@ -732,7 +732,7 @@
 				 height="16"
 				 label="Disable minimum camera zoom distance"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="disableminzoomdist"
 				 width="250"
 				 control_name="FSDisableMinZoomDist"
@@ -743,11 +743,22 @@
 				 height="16"
 				 label="Allow the camera to move w/o constraints"
 				 layout="topleft"
-				 left="10"
+				 left="5"
 				 name="ignorecameraconstraints"
 				 width="250"
 				 control_name="FSIgnoreSimulatorCameraConstraints"
 				 tool_tip="Ignores the 'push' the simulator applies to your camera to keep it out of objects. REQUIRES RESTART!"/>
+				<check_box
+				 top_pad="5"
+				 follows="left|top"
+				 height="16"
+				 label="Reset camera position on avatar movement"
+				 layout="topleft"
+				 left="5"
+				 name="resetcameraonmovement"
+				 width="250"
+				 control_name="FSResetCameraOnMovement"
+				 tool_tip="Resets the camera to its default position when you move the avatar"/>
 			</panel>
 		</panel>