From 3afaa799628c74abdd1542514bc3852432c3925b Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Mon, 15 Jan 2018 11:40:32 -0500
Subject: STORM-2145 Fixed bug.  Now you can only have one of the
 load/save/delete floaters open at once.

---
 .../default/xui/en/floater_delete_pref_preset.xml  |   2 +-
 .../default/xui/en/floater_load_pref_preset.xml    |   2 +-
 .../xui/en/floater_preferences_move_advanced.xml   | 140 ---------------------
 .../xui/en/floater_preferences_view_advanced.xml   | 140 +++++++++++++++++++++
 .../default/xui/en/floater_save_pref_preset.xml    |   2 +-
 .../default/xui/en/panel_preferences_move.xml      |   2 +-
 6 files changed, 144 insertions(+), 144 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
index 0688fdb42c..3360d7bec9 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_pref_preset.xml
@@ -4,7 +4,7 @@
  height="130"
  help_topic="floater_delete_preset"
  layout="topleft"
- name="Delete Pref Preset"
+ name="delete_pref_preset"
  save_rect="true"
  title="DELETE PREF PRESET"
  width="300">
diff --git a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
index 5f2eb770e2..49c21f1ea7 100644
--- a/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_load_pref_preset.xml
@@ -4,7 +4,7 @@
  height="130"
  help_topic="floater_load_preset"
  layout="topleft"
- name="Load Pref Preset"
+ name="load_pref_preset"
  save_rect="true"
  title="LOAD PREF PRESET"
  width="300">
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
deleted file mode 100644
index 28e5d2c607..0000000000
--- a/indra/newview/skins/default/xui/en/floater_preferences_move_advanced.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- height="170"
- layout="topleft"
- name="floaterpreferencesmoveadvanced"
- help_topic="floatermoveadvanced"
- title="ADJUST CAMERA VIEW"
- save_rect="true"
- width="280">
-
-  <text
-    follows="top|left|right"
-    height="16"
-    layout="topleft"
-    left="10"
-    top="10"
-    width="100">
-      Camera offset:
-  </text>
-
-  <spinner
-   height="20"
-   label="X"
-   label_width="12"
-   follows="topl|eft"
-   left="10"
-   name="camera_x"
-   top_pad="5"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <spinner
-   height="20"
-   label="Y"
-   label_width="12"
-   follows="topl|eft"
-   name="camera_y"
-   left_pad="20"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <spinner
-   height="20"
-   label="Z"
-   label_width="12"
-   follows="topl|eft"
-   name="camera_z"
-   left_pad="20"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <text
-    follows="top|left|right"
-    height="16"
-    layout="topleft"
-    left="10"
-    top_pad="20"
-    width="100">
-      Focus offset:
-  </text>
-
-  <spinner
-   height="20"
-   label="X"
-   label_width="12"
-   follows="topl|eft"
-   left="10"
-   name="focus_x"
-   top_pad="5"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <spinner
-   height="20"
-   label="Y"
-   label_width="12"
-   follows="topl|eft"
-   name="focus_y"
-   left_pad="20"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <spinner
-   height="20"
-   label="Z"
-   label_width="12"
-   follows="topl|eft"
-   name="focus_z"
-   left_pad="20"
-   min_val="-1e+007"
-   max_val="1e+007"
-   width="70">
-    <spinner.commit_callback
-     function="CommitSettings" />
-  </spinner>
-
-  <button
-   follows="left|top"
-   height="23"
-   label="OK"
-   layout="topleft"
-   left="90"
-   name="ok"
-   top_pad="30"
-   width="90">
-    <button.commit_callback
-     function="Ok"/>
-  </button>
-  <button
-   follows="left|top"
-   height="23"
-   label="Cancel"
-   layout="topleft"
-   left_pad="5"
-   name="cancel"
-   width="90">
-    <button.commit_callback
-     function="Cancel"/>
-  </button>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
new file mode 100644
index 0000000000..5b2cbee914
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences_view_advanced.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="170"
+ layout="topleft"
+ name="floaterpreferencesviewadvanced"
+ help_topic="floaterviewadvanced"
+ title="ADJUST CAMERA VIEW"
+ save_rect="true"
+ width="280">
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left="10"
+    top="10"
+    width="100">
+      Camera offset:
+  </text>
+
+  <spinner
+   height="20"
+   label="X"
+   label_width="12"
+   follows="topl|eft"
+   left="10"
+   name="camera_x"
+   top_pad="5"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Y"
+   label_width="12"
+   follows="topl|eft"
+   name="camera_y"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Z"
+   label_width="12"
+   follows="topl|eft"
+   name="camera_z"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <text
+    follows="top|left|right"
+    height="16"
+    layout="topleft"
+    left="10"
+    top_pad="20"
+    width="100">
+      Focus offset:
+  </text>
+
+  <spinner
+   height="20"
+   label="X"
+   label_width="12"
+   follows="topl|eft"
+   left="10"
+   name="focus_x"
+   top_pad="5"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Y"
+   label_width="12"
+   follows="topl|eft"
+   name="focus_y"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <spinner
+   height="20"
+   label="Z"
+   label_width="12"
+   follows="topl|eft"
+   name="focus_z"
+   left_pad="20"
+   min_val="-1e+007"
+   max_val="1e+007"
+   width="70">
+    <spinner.commit_callback
+     function="CommitSettings" />
+  </spinner>
+
+  <button
+   follows="left|top"
+   height="23"
+   label="OK"
+   layout="topleft"
+   left="90"
+   name="ok"
+   top_pad="30"
+   width="90">
+    <button.commit_callback
+     function="Ok"/>
+  </button>
+  <button
+   follows="left|top"
+   height="23"
+   label="Cancel"
+   layout="topleft"
+   left_pad="5"
+   name="cancel"
+   width="90">
+    <button.commit_callback
+     function="Cancel"/>
+  </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 7dee28eff3..a9cda26f0b 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -4,7 +4,7 @@
  height="145"
  help_topic="floater_save_preset"
  layout="topleft"
- name="Save Pref Preset"
+ name="save_pref_preset"
  save_rect="true"
  title="SAVE PREF PRESET"
  width="300">
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 d832dac4ff..8d8441695f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -138,7 +138,7 @@
     width="115">
     <button.commit_callback
      function="Floater.Show"
-     parameter="prefs_move_advanced" />
+     parameter="prefs_view_advanced" />
   </button>  
 
   <button
-- 
cgit v1.2.3