From 1543f98bab0ca7445c09e63644c8a5e428f9c5b1 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 18 Nov 2011 22:19:57 +0200
Subject: EXP-1501 FIX Specified help topic for the IM floater.

---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index cb7d91abb8..0ef6709f11 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -5,6 +5,7 @@
  default_tab_group="1"
  follows="all"
  height="350"
+ help_topic="floater_im_box"
  layout="topleft"
  name="panel_im"
  can_dock="false"
-- 
cgit v1.2.3


From 649beed53bd44ae5b06cd36f40897ed561fe48ab Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 18 Nov 2011 22:23:09 +0200
Subject: EXP-1577 FIX Made agent profile position and size persistent.

Enable My Profile to use saved_rect.
Value of the "WebProfileRect" setting is ignored in this case.
---
 .../default/xui/en/floater_my_web_profile.xml      |  9 +++
 .../skins/default/xui/en/panel_snapshot_local.xml  | 65 ++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_my_web_profile.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
new file mode 100644
index 0000000000..df46fc198f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_web_profile"
+         help_topic="web_profile"
+         width="780"
+         height="775"
+         save_rect="true"
+         single_instance="true"
+         reuse_instance="false"
+         filename="floater_web_content.xml"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 4d6c4bcdfa..a9b373430a 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -80,6 +80,7 @@
          name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
+<!--
     <spinner
      allow_text_entry="false"
      decimal_digits="0"
@@ -167,6 +168,70 @@
      width="60">
        ([QLVL])
     </text>
+ -->
+    <layout_stack
+     follows="all"
+     height="275"
+     layout="bottomleft"
+     name="edit_panel_ls"
+     left_delta="0"
+     orientation="vertical"
+     top_pad="10"
+     right="-10">
+        <layout_panel
+         follows="top|left|right"
+         height="23"
+         layout="topleft"
+         left="0"
+         name="size_controls_lp"
+         user_resize="false" 
+         auto_resize="false"
+         top="0"
+         right="-1"
+         visible="true">
+            <button
+             follows="top|left|right"
+             height="23"
+             label="Info"
+             layout="topleft"
+             name="info_btn"
+             tab_stop="false"
+             tool_tip="Show pick information"
+             right="-1" />
+        </layout_panel>
+        <layout_panel
+         follows="top|left|right"
+         height="23"
+         layout="topleft"
+         left="0"
+         name="test_lp"
+         user_resize="false" 
+         auto_resize="true"
+         top="0"
+         right="-1"
+         visible="true">
+            <button
+             follows="top|left|right"
+             height="23"
+             label="Test"
+             layout="topleft"
+             name="test_btn"
+             tab_stop="false"
+             tool_tip="Show pick information"
+             right="-1" />
+        </layout_panel>
+        <layout_panel
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         left="0"
+         name="spacer_lp"
+         user_resize="false" 
+         auto_resize="true"
+         top="0"
+         right="-1"
+         visible="true" />
+    </layout_stack>
     <button
      follows="right|bottom"
      height="23"
-- 
cgit v1.2.3


From b1b852ce6c73f5723df5ed5a0c729da7df847c26 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 18 Nov 2011 23:01:35 +0200
Subject: EXP-1577 FOLLOWUP Reverting an accidentally submitted change.

---
 .../skins/default/xui/en/panel_snapshot_local.xml  | 65 ----------------------
 1 file changed, 65 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index a9b373430a..4d6c4bcdfa 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
@@ -80,7 +80,6 @@
          name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
-<!--
     <spinner
      allow_text_entry="false"
      decimal_digits="0"
@@ -168,70 +167,6 @@
      width="60">
        ([QLVL])
     </text>
- -->
-    <layout_stack
-     follows="all"
-     height="275"
-     layout="bottomleft"
-     name="edit_panel_ls"
-     left_delta="0"
-     orientation="vertical"
-     top_pad="10"
-     right="-10">
-        <layout_panel
-         follows="top|left|right"
-         height="23"
-         layout="topleft"
-         left="0"
-         name="size_controls_lp"
-         user_resize="false" 
-         auto_resize="false"
-         top="0"
-         right="-1"
-         visible="true">
-            <button
-             follows="top|left|right"
-             height="23"
-             label="Info"
-             layout="topleft"
-             name="info_btn"
-             tab_stop="false"
-             tool_tip="Show pick information"
-             right="-1" />
-        </layout_panel>
-        <layout_panel
-         follows="top|left|right"
-         height="23"
-         layout="topleft"
-         left="0"
-         name="test_lp"
-         user_resize="false" 
-         auto_resize="true"
-         top="0"
-         right="-1"
-         visible="true">
-            <button
-             follows="top|left|right"
-             height="23"
-             label="Test"
-             layout="topleft"
-             name="test_btn"
-             tab_stop="false"
-             tool_tip="Show pick information"
-             right="-1" />
-        </layout_panel>
-        <layout_panel
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         left="0"
-         name="spacer_lp"
-         user_resize="false" 
-         auto_resize="true"
-         top="0"
-         right="-1"
-         visible="true" />
-    </layout_stack>
     <button
      follows="right|bottom"
      height="23"
-- 
cgit v1.2.3