From 40ca1f90cead2e5445eb5152de05350aea0fa195 Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Wed, 21 Oct 2009 00:24:31 +0000
Subject: EXT-1549: Moved the Lock icon to the left of Help button.

Various floaters can display a lock icon in the title bar, but these
were appearing over the new Help button, "?". This change moves the
Lock icons to the left of the Help button.

While debugging the change I found some modal dialogs that shouldn't
display a help button, so I removed their help_topic definitions.
---
 .../skins/default/xui/en/floater_critical.xml      |  1 -
 .../skins/default/xui/en/floater_customize.xml     | 60 +++++++++++-----------
 .../xui/en/floater_inventory_item_properties.xml   |  4 +-
 .../default/xui/en/floater_preview_notecard.xml    |  4 +-
 .../default/xui/en/floater_script_preview.xml      |  4 +-
 .../skins/default/xui/en/floater_select_key.xml    |  1 -
 indra/newview/skins/default/xui/en/floater_tos.xml |  1 -
 .../default/xui/en/floater_wearable_save_as.xml    |  1 -
 8 files changed, 36 insertions(+), 40 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml
index 7d1a1113b0..5475a1cf6a 100644
--- a/indra/newview/skins/default/xui/en/floater_critical.xml
+++ b/indra/newview/skins/default/xui/en/floater_critical.xml
@@ -5,7 +5,6 @@
  height="500"
  layout="topleft"
  name="modal container"
- help_topic="modal_container"
  width="600">
     <button
      height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 70468e7474..57f5800f2c 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -39,10 +39,10 @@
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -335,10 +335,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -590,10 +590,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -818,10 +818,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -1006,10 +1006,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -1212,10 +1212,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -1418,10 +1418,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -1624,10 +1624,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -1830,10 +1830,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -2048,10 +2048,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -2254,10 +2254,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -2460,10 +2460,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -2666,10 +2666,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -2872,10 +2872,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
@@ -3159,10 +3159,10 @@ scratch and wear it.
              height="18"
              image_name="Lock"
              layout="topleft"
-             left="333"
+             left="315"
              mouse_opaque="true"
              name="square"
-             top="5"
+             top="4"
              width="18" />
             <icon
              height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 2882f233c2..e3e2decef7 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -33,10 +33,10 @@
      height="18"
      image_name="Lock"
      layout="topleft"
-     left="294"
+     left="276"
      mouse_opaque="true"
      name="IconLocked"
-     top="5"
+     top="4"
      width="18" />
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 448b0fa6af..8cdafe110a 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -33,10 +33,10 @@
      height="18"
      image_name="Lock"
      layout="topleft"
-     left="340"
+     left="322"
      mouse_opaque="true"
      name="lock"
-     top="1"
+     top="4"
      width="18" />
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index 54ab30124a..a415239867 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -30,10 +30,10 @@
      height="18"
      image_name="Lock"
      layout="topleft"
-     left="444"
+     left="426"
      mouse_opaque="true"
      name="lock"
-     top="3"
+     top="4"
      width="18" />
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 8e1317440e..b89af0ef3e 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -6,7 +6,6 @@
  height="100"
  layout="topleft"
  name="modal container"
- help_topic="modal_container"
  width="240">
     <button
      height="20"
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index b290a9c87d..54facbb659 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -5,7 +5,6 @@
  height="500"
  layout="topleft"
  name="modal container"
- help_topic="modal_container"
  width="600">
     <floater.string
      name="real_url">
diff --git a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
index e698dfe2dc..ee67989d33 100644
--- a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml
@@ -6,7 +6,6 @@
  height="100"
  layout="topleft"
  name="modal container"
- help_topic="modal_container"
  width="240">
     <button
      height="20"
-- 
cgit v1.2.3