From e65852e9a58ec92763b88369f53092628ab7a6b8 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Thu, 3 May 2012 11:38:05 -0600
Subject: For SH-3086: add functions to refetch all previous textures through
 HTTP and from cache

---
 .../xui/en/floater_texture_fetch_debugger.xml      | 109 +++++++++++++++++++--
 1 file changed, 102 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index 44b6a63bca..ca2f9bfd94 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="550"
+ height="600"
  layout="topleft"
  name="TexFetchDebugger"
  help_topic="texfetchdebugger"
@@ -195,10 +195,34 @@
   height="25"
   layout="topleft"
   left_delta="0"
+  name="total_time_refetch_all_cache_label"
+  top_delta="25"
+  width="540">
+    16, Refetching all textures from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
   name="total_time_refetch_vis_http_label"
   top_delta="25"
   width="540">
-    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+    17, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_all_http_label"
+  top_delta="25"
+  width="540">
+    18, Refetching all textures from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
   </text>
   <spinner
      decimal_digits="2"
@@ -206,7 +230,7 @@
      height="20"
      increment="0.01"
      initial_value="1.0"
-     label="17, Ratio of Texel/Pixel:"
+     label="19, Ratio of Texel/Pixel:"
      label_width="130"
      layout="topleft"
      left_delta="0"
@@ -218,14 +242,61 @@
     <spinner.commit_callback
 		function="TexFetchDebugger.ChangeTexelPixelRatio" />
   </spinner>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="texture_source_label"
+  top_delta="30"
+  width="110">
+    20, Texture Source:
+  </text>
+  <radio_group
+     control_name="TextureFetchSource"
+     follows="top|left"
+     draw_border="false"
+     height="25"
+     layout="topleft"
+     left_pad="0"
+     name="texture_source"
+     top_delta="0"
+     width="264">
+    <radio_item
+     height="16"
+     label="Cache + Network"
+     layout="topleft"
+     left="3"
+     name="0"
+     top="0"
+     width="100" />
+    <radio_item
+     height="16"
+     label="Cache Only"
+     layout="topleft"
+     left_delta="120"
+     name="1"
+     top_delta="0"
+     width="200" />
+    <radio_item
+     height="16"
+     label="Network Only"
+     layout="topleft"
+     left_delta="100"
+     name="2"
+     top_delta="0"
+     width="200" />
+  </radio_group>
   <button
    follows="left|top"
    height="20"
    label="Start"
    layout="topleft"
-   left_delta="0"
+   left="10"
    name="start_btn"
-   top_delta="30"
+   top_delta="20"
    width="70">
     <button.commit_callback
 		function="TexFetchDebugger.Start" />
@@ -261,7 +332,7 @@
    layout="topleft"
    left="10"
    name="cacheread_btn"
-   top_delta="30"
+   top_delta="20"
    width="80">
     <button.commit_callback
 		function="TexFetchDebugger.CacheRead" />
@@ -321,11 +392,23 @@
    layout="topleft"
    left="10"
    name="refetchviscache_btn"
-   top_delta="30"
+   top_delta="20"
    width="120">
     <button.commit_callback
 		function="TexFetchDebugger.RefetchVisCache" />
   </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch All Cache"
+   layout="topleft"
+   left_pad="7"
+   name="refetchallcache_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchAllCache" />
+  </button>
   <button
    follows="left|top"
    height="20"
@@ -338,4 +421,16 @@
     <button.commit_callback
 		function="TexFetchDebugger.RefetchVisHTTP" />
   </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch All HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="refetchallhttp_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchAllHTTP" />
+  </button>
 </floater>
-- 
cgit v1.2.3


From 0afca8603a56205df4c4e310387651726cbfbe3c Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Fri, 4 May 2012 18:16:37 -0600
Subject: fix crashes and flaws for SH-3086

---
 .../default/xui/en/floater_texture_fetch_debugger.xml      | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index ca2f9bfd94..6fbdd8a318 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -266,7 +266,7 @@
      width="264">
     <radio_item
      height="16"
-     label="Cache + Network"
+     label="Cache + HTTP"
      layout="topleft"
      left="3"
      name="0"
@@ -274,18 +274,10 @@
      width="100" />
     <radio_item
      height="16"
-     label="Cache Only"
-     layout="topleft"
-     left_delta="120"
-     name="1"
-     top_delta="0"
-     width="200" />
-    <radio_item
-     height="16"
-     label="Network Only"
+     label="HTTP Only"
      layout="topleft"
      left_delta="100"
-     name="2"
+     name="1"
      top_delta="0"
      width="200" />
   </radio_group>
-- 
cgit v1.2.3


From c0a79227d71fbfdd2bfa6402f92d35d0c23d7f92 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Tue, 29 May 2012 16:52:57 -0700
Subject: Add individual volume controls to pannel_volume_pulldown Also
 includes translations for some of the other languages

---
 .../skins/default/xui/en/panel_volume_pulldown.xml | 310 +++++++++++++++++++--
 1 file changed, 286 insertions(+), 24 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 7b22b2cce1..7e882c2b5e 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -8,31 +8,12 @@
  border="false"
  chrome="true"
  follows="bottom"
- height="150"
+ height="155"
  layout="topleft"
  name="volumepulldown_floater"
- width="32">
- <slider
-  control_name="AudioLevelMaster"
-  follows="left|top"
-  left="0"
-  top="1"
-  orientation="vertical"
-  height="120"
-  increment="0.05"
-  initial_value="0.5"
-  layout="topleft"
-  name="mastervolume"
-  show_text="false"
-  slider_label.halign="right"
-  top_pad="2"
-  volume="true">
-  <slider.commit_callback
-   function="Vol.setControlFalse"
-   parameter="MuteAudio" />
-  </slider>
-  <button
-    left="10"
+ width="210">
+   <button
+    left="187"
     top_pad="9"
     width="12"
     height="12"
@@ -44,5 +25,286 @@
     scale_image="false">
     <button.commit_callback
        function="Vol.GoAudioPrefs" />
-  </button>
+  </button> 
+      <slider
+     control_name="AudioLevelMaster"
+     follows="top|left"
+     font.style="BOLD"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Master"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="System Volume"
+     show_text="false"
+     top="10"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAudio" />
+    </slider>
+    <button
+     control_name="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <slider
+        control_name="AudioLevelUI"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="15"
+        increment="0.025"
+        initial_value="0.5"
+        label="Buttons"
+        label_width="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        name="UI Volume"
+        show_text="false"
+        top_pad="4"
+        volume="true">
+    <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteUI" />
+    </slider>
+    <button
+        control_name="MuteUI"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <slider
+     control_name="AudioLevelAmbient"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Ambient"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="Wind Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAmbient" />
+    </slider>
+    <button
+     control_name="MuteAmbient"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <slider
+     control_name="AudioLevelSFX"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Sounds"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="SFX Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteSounds" />
+    </slider>
+    <button
+     control_name="MuteSounds"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16">
+      <button.commit_callback
+      function="Pref.SetSounds"/>
+    </button>
+  <check_box
+    name="gesture_audio_play_btn"
+		control_name="EnableGestureSounds"
+    disabled_control="MuteAudio"
+    height="16"
+    layout="topleft"
+    left_pad="5"
+    tool_tip="Enable sounds from gestures"
+    top_delta="2"
+    width="350"/>
+    <slider
+     control_name="AudioLevelMusic"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Music"
+     label_width="50"
+     left="10"
+     width="150"
+     layout="topleft"
+     name="Music Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteMusic" />
+    </slider>
+    <button
+     control_name="MuteMusic"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <check_box
+        control_name="AudioStreamingMusic"
+        height="16"
+        tool_tip="Enable Streaming Music"
+        layout="topleft"
+        left_pad="5"
+        name="enable_music"
+        top_delta="2"
+        width="350">
+        <check_box.commit_callback
+            function="Pref.updateMediaAutoPlayCheckbox"/>
+    </check_box>
+    <slider
+        control_name="AudioLevelMedia"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="16"
+        increment="0.025"
+        initial_value="0.5"
+        label="Media"
+        label_width="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        name="Media Volume"
+        show_text="false"
+        top_pad="4"
+        volume="true">
+      <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteMedia" />
+    </slider>
+    <button
+        control_name="MuteMedia"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <check_box
+        label_text.halign="left"
+        follows="left|top"
+        height="16"
+        control_name ="AudioStreamingMedia"
+        tool_tip="Enable Streaming Media"
+        layout="topleft"
+        top_delta="2"
+        left_pad="5"
+        name="enable_media"
+        width="110">
+        <check_box.commit_callback
+            function="Pref.updateMediaAutoPlayCheckbox"/>
+    </check_box>
+    <slider
+        control_name="AudioLevelVoice"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="16"
+        increment="0.025"
+        initial_value="0.5"
+        label="Voice"
+        label_width="50"
+        left="10"
+        width="150"
+        layout="topleft"
+        top_pad="4"
+        name="Voice Volume"
+        show_text="false"
+        volume="true">
+    <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteVoice" />
+    </slider>
+    <button
+        control_name="MuteVoice"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <check_box
+        label_text.halign="left"
+        follows="left|top"
+        height="16"
+        control_name ="EnableVoiceChat"
+        disabled_control="CmdLineDisableVoice"
+        tool_tip="Enable Voice Chat"
+        layout="topleft"
+        top_delta="2"
+        left_pad="5"
+        name="enable_voice_check"
+        width="110"/>
 </panel>
-- 
cgit v1.2.3


From 749026e547268138b720213cf6845bce22f7e0ce Mon Sep 17 00:00:00 2001
From: "Tank@Test_Master.ftrdhcpuser.net" <Tank@Test_Master.ftrdhcpuser.net>
Date: Thu, 7 Jun 2012 14:01:38 -0700
Subject: widen the floater a bit to make more room for translations

---
 .../skins/default/xui/en/panel_volume_pulldown.xml | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 7e882c2b5e..66a2ddeea8 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -11,7 +11,7 @@
  height="155"
  layout="topleft"
  name="volumepulldown_floater"
- width="210">
+ width="225">
    <button
     left="187"
     top_pad="9"
@@ -25,7 +25,7 @@
     scale_image="false">
     <button.commit_callback
        function="Vol.GoAudioPrefs" />
-  </button> 
+  </button>
       <slider
      control_name="AudioLevelMaster"
      follows="top|left"
@@ -34,9 +34,9 @@
      increment="0.025"
      initial_value="0.5"
      label="Master"
-     label_width="50"
+     label_width="60"
      left="10"
-     width="150"
+     width="160"
      layout="topleft"
      name="System Volume"
      show_text="false"
@@ -66,9 +66,9 @@
         increment="0.025"
         initial_value="0.5"
         label="Buttons"
-        label_width="50"
+        label_width="60"
         left="10"
-        width="150"
+        width="160"
         layout="topleft"
         name="UI Volume"
         show_text="false"
@@ -99,9 +99,9 @@
      increment="0.025"
      initial_value="0.5"
      label="Ambient"
-     label_width="50"
+     label_width="60"
      left="10"
-     width="150"
+     width="160"
      layout="topleft"
      name="Wind Volume"
      show_text="false"
@@ -132,9 +132,9 @@
      increment="0.025"
      initial_value="0.5"
      label="Sounds"
-     label_width="50"
+     label_width="60"
      left="10"
-     width="150"
+     width="160"
      layout="topleft"
      name="SFX Volume"
      show_text="false"
@@ -178,9 +178,9 @@
      increment="0.025"
      initial_value="0.5"
      label="Music"
-     label_width="50"
+     label_width="60"
      left="10"
-     width="150"
+     width="160"
      layout="topleft"
      name="Music Volume"
      show_text="false"
@@ -223,9 +223,9 @@
         increment="0.025"
         initial_value="0.5"
         label="Media"
-        label_width="50"
+        label_width="60"
         left="10"
-        width="150"
+        width="160"
         layout="topleft"
         name="Media Volume"
         show_text="false"
@@ -270,9 +270,9 @@
         increment="0.025"
         initial_value="0.5"
         label="Voice"
-        label_width="50"
+        label_width="60"
         left="10"
-        width="150"
+        width="160"
         layout="topleft"
         top_pad="4"
         name="Voice Volume"
-- 
cgit v1.2.3


From 0a163f9ccd31687c910e74bdddd6dd86d849edeb Mon Sep 17 00:00:00 2001
From: "Tank@Test_Master.ftrdhcpuser.net" <Tank@Test_Master.ftrdhcpuser.net>
Date: Thu, 7 Jun 2012 14:02:19 -0700
Subject: remove gear icon

---
 .../newview/skins/default/xui/en/panel_volume_pulldown.xml | 14 --------------
 1 file changed, 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 66a2ddeea8..6adede0362 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -12,20 +12,6 @@
  layout="topleft"
  name="volumepulldown_floater"
  width="225">
-   <button
-    left="187"
-    top_pad="9"
-    width="12"
-    height="12"
-    follows="top|left"
-    name="prefs_btn"
-    image_unselected="Icon_Gear_Foreground"
-    image_disabled="Icon_Gear_Background"
-    image_pressed="Icon_Gear_Press"
-    scale_image="false">
-    <button.commit_callback
-       function="Vol.GoAudioPrefs" />
-  </button>
       <slider
      control_name="AudioLevelMaster"
      follows="top|left"
-- 
cgit v1.2.3


From a64bb32b0550afdf9cd54c4f3f38225a1fcc0b90 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 8 Jun 2012 18:05:31 -0400
Subject: STORM-1877 Missing entries in strings.xml for some Inventory folder
 names

---
 indra/newview/skins/default/xui/en/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4ccec4838a..f565928d44 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2139,11 +2139,15 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
   <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
   We should localize both of them with the same value -->
 	<string name="InvFolder favorite">My Favorites</string>
+	<string name="InvFolder Favorites">My Favorites</string>
+	<string name="InvFolder favorites">My Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder Initial Outfits">Initial Outfits</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
 	<string name="InvFolder Accessories">Accessories</string>
 	<string name="InvFolder Meshes">Meshes</string>
+	<string name="InvFolder Received Items">Received Items</string>
+	<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>
-- 
cgit v1.2.3


From e8bec251dc98950958be2f4f668c5408fcf56b9b Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Mon, 11 Jun 2012 08:36:10 -0700
Subject: remove tooltip when hovering over main volume icon in the status bar

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 3aa34439f1..dd2a0c6627 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -129,6 +129,5 @@
      left_pad="5"
      top="2"
      name="volume_btn"
-     tool_tip="Global Volume Control"
      width="16" />
 </panel>
-- 
cgit v1.2.3


From b4e1d03584ce0ee740887def2f7204dc3c5733c4 Mon Sep 17 00:00:00 2001
From: Whirly <none@none>
Date: Tue, 26 Jun 2012 15:37:31 +0100
Subject: STORM-1895 - Rename Delay Restart button to Cancel Restart

---
 indra/newview/skins/default/xui/en/panel_region_debug.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 4550603134..81b2281adb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -194,11 +194,11 @@
     <button
      follows="left|top"
      height="20"
-     label="Delay Restart"
+     label="Cancel Restart"
      layout="topleft"
      left_pad="155"
      name="cancel_restart_btn"
-     tool_tip="Delay region restart by one hour"
+     tool_tip="Cancel region restart"
      top_delta="0"
      width="150" />
 </panel>
-- 
cgit v1.2.3


From eb15b6f93618f34516e00d3ba96237fde8663f58 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 28 Jun 2012 17:55:10 -0400
Subject: Remove redundant "create_account_url" string from panel_login.xml. We
 already have a "create_account_url" string in strings.xml, and in fact --
 according to Eli -- the strings.xml values are "better" for non-English
 languages. Unfortunately those "better" strings weren't being used. They were
 tied to the FirstRun notification, which seems to have been disengaged.
 Changed llpanellogin.cpp to look in strings.xml rather than panel_login.xml
 when clicking the "Sign Up" link on the login panel.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 223326dd06..994eb909e2 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -8,10 +8,6 @@ name="panel_login"
 focus_root="true" 
 top="600"
  width="996">
-<panel.string
-     name="create_account_url">
-       http://join.secondlife.com/
-</panel.string>
 <string name="reg_in_client_url" translate="false">
      http://secondlife.eniac15.lindenlab.com/reg-in-client/
 </string>
-- 
cgit v1.2.3


From e4ee7cbc6046b23f40f144b9b1ec8bd946d138fc Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 29 Jun 2012 14:43:31 -0400
Subject: Use [create_account_url] from strings.xml consistently in
 notifications.xml. The URL whose simple form is http://join.secondlife.com
 actually appears in a number of places in the localized notifications.xml
 files. It's supposed to be localized for the current viewer language -- and
 in strings.xml, it is. But the same URL is restated a couple times in
 notifications.xml, sometimes localized, sometimes not. Add
 "create_account_url" to init_default_trans_args(), permitting us to embed
 [create_account_url] anywhere in the skin files. Then replace all known
 occurrences of that URL in notifications.xml files with [create_account_url].

---
 indra/newview/skins/default/xui/en/notifications.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a26c5bb344..1e7aacd999 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -881,8 +881,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
 	option="0"
 	name="url"
 	target = "_external">
-
-			http://join.secondlife.com/
+		[create_account_url]
     </url>
     <usetemplate
      name="okcancelbuttons"
@@ -2804,7 +2803,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
 [APP_NAME] installation is complete.
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-Return to [http://join.secondlife.com secondlife.com] to create a new account?
+Return to [[create_account_url] secondlife.com] to create a new account?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
-- 
cgit v1.2.3


From e4cea7631293b1192bfe720146410c1aa61654aa Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 11 Jul 2012 18:58:41 -0400
Subject: STORM-1898 Add "Copy SLURL" to context menu when right clicking
 Landmarks in Inventory

---
 indra/newview/skins/default/xui/en/menu_inventory.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index b13bf5b508..13dc0b941a 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -537,6 +537,14 @@
      layout="topleft"
      name="Landmark Separator" />
     <menu_item_call
+    label="Copy SLurl"
+    layout="topleft"
+    name="url_copy">
+       <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_slurl" />
+   </menu_item_call> 
+   <menu_item_call
      label="About Landmark"
      layout="topleft"
      name="About Landmark">
-- 
cgit v1.2.3


From 8356cc1c4fd921cac46d9d98bdf80c7c8ae05b22 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 13 Jul 2012 12:38:26 -0400
Subject: Try reorganizing panel_login.xml per Leo's redesign. This includes
 replacing the small "Sign up" link with a "CREATE YOUR ACCOUNT: Start now"
 button, requiring a small tweak to the C++ code to Do The Right Thing when
 the button (vs. the link) is clicked.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 171 ++++++++++++---------
 1 file changed, 102 insertions(+), 69 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 994eb909e2..64ecdbf752 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -42,16 +42,28 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="705"
-min_width="705"
+width="865"
+min_width="865"
 height="80">
 <text
 follows="left|bottom"
+font="SansSerif"
+font.style="BOLD"
+font.size="Large"
+height="16"
+name="log_in_text"
+top="8"
+left="15"
+width="150">
+LOG IN
+</text>
+<text
+follows="left|bottom"
 font="SansSerifSmall"
 height="16"
 name="username_text"
-top="20"
-left="20"
+top="35"
+left="15"
 width="150">
 Username:
 </text>
@@ -66,19 +78,21 @@ tool_tip="The username you chose when you registered, like bobsmith12 or Steller
 top_pad="0"
 name="username_combo"
 width="178">
+<!-- empirically, displayed width is 150 anyway?!? -->
   <combo_box.combo_button
    visible ="false"/>
   <combo_box.drop_down_button
    visible ="false"/>
 </combo_box>
+<!-- left="175" based on actual "username_combo" width of 150 vs. 178 -->
 <text
 follows="left|bottom"
 font="SansSerifSmall"
-height="15"
-left_pad="-19"
+height="16"
 name="password_text"
-top="20"
-    width="150">
+top="35"
+left="175"
+width="150">
        Password:
 </text>
 <line_editor
@@ -86,46 +100,25 @@ follows="left|bottom"
   height="22"
   max_length_bytes="16"
 name="password_edit"
-is_password="true" 
+is_password="true"
 select_on_focus="true"
   top_pad="0"
   width="135" />
- <check_box
-control_name="RememberPassword"
+<text
 follows="left|bottom"
 font="SansSerifSmall"
 height="16"
-label="Remember password"
-  top_pad="3"
-  name="remember_check"
- width="135" />
-<button
-  follows="left|bottom"
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Log In"
-  label_color="White"
-  layout="topleft"
-  left_pad="10"
-  name="connect_btn"
-  top="35"
-  width="90" />
-  <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
-  left_pad="8"
-  name="start_location_text"
-  top="20"
-  width="130">
-       Start at:
- </text>
+left="320"
+name="start_location_text"
+top="35"
+width="130">
+     Start at:
+</text>
 <combo_box
 allow_text_entry="true"
 control_name="NextLoginLocation"
   follows="left|bottom"
-  height="23"
+  height="22"
 max_chars="128"
 top_pad="0"
 name="start_location_combo"
@@ -142,60 +135,100 @@ name="MyHome"
 label="&lt;Type region name&gt;"
 name="Typeregionname"   value="" />
 </combo_box>
+<text
+follows="left|bottom"
+font="SansSerif"
+font.style="BOLD"
+font.size="Large"
+text_color="EmphasisColor"
+left="370"
+name="login_help"
+top="32"
+width="16">
+ ☠
+</text>
 <combo_box
 allow_text_entry="true"
 font="SansSerifSmall"
    follows="left|right|bottom"
    height="23"
    max_chars="256"
+left="490"
+top="51"
 layout="topleft"
 top_pad="2"
 name="server_combo"
 width="135"
   visible="false" />
-</layout_panel>
-<layout_panel
-tab_stop="false"
-follows="right|bottom"
-name="links"
-width="205"
-min_width="205"
-height="80">
-   <text
-follows="right|bottom"
-font="SansSerifSmall"
-text_color="EmphasisColor"
-halign="right"
-height="16"
-top="12"
-right="-10"
-name="create_new_account_text"
-  width="200">
-       Sign up
- </text>
 <text
-follows="right|bottom"
+follows="left|bottom"
 font="SansSerifSmall"
 text_color="EmphasisColor"
-halign="right"
 height="16"
 name="forgot_password_text"
-top_pad="12"
-right="-10"
+top="35"
+left="630"
   width="200">
        Forgot your username or password?
 </text>
+<button
+  follows="left|bottom"
+  top_pad="0"
+  left="630"
+  height="23"
+  image_unselected="PushButton_On"
+  image_selected="PushButton_On_Selected"
+  label="Log In"
+  label_color="White"
+  layout="topleft"
+  left_pad="10"
+  name="connect_btn"
+  width="90" />
+<check_box
+control_name="RememberPassword"
+follows="left|bottom"
+font="SansSerifSmall"
+left="730"
+top="56"
+height="16"
+label="Remember password"
+  top_pad="3"
+  name="remember_check"
+ width="135" />
+</layout_panel>
+<layout_panel
+tab_stop="false"
+follows="right|bottom"
+name="links"
+width="210"
+min_width="210"
+height="80">
 <text
 follows="right|bottom"
-font="SansSerifSmall"
-text_color="EmphasisColor"
+font="SansSerif"
+font.style="BOLD"
+font.size="Large"
 halign="right"
 height="16"
-name="login_help"
-top_pad="2"
-right="-10"
-    width="200">
-       Need help logging in?   </text>
+name="create_account_text"
+top="8"
+right="-15"
+width="200">
+CREATE YOUR ACCOUNT
+</text>
+<button
+  follows="right|bottom"
+  top="35"
+  right="-15"
+  height="23"
+  image_unselected="PushButton_On"
+  image_selected="PushButton_On_Selected"
+  label="Start now"
+  label_color="White"
+  layout="topleft"
+  left_pad="10"
+  name="create_new_account_btn"
+  width="90" />
 <!--  <text
     follows="right|bottom"
     font="SansSerifSmall"
-- 
cgit v1.2.3


From da69ec0138c818cd5c0668b10ec977d87a10fdd3 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 13 Jul 2012 16:20:39 -0400
Subject: Try to adapt non-English panel_login.xml files for Leo's new layout.
 en/panel_login.xml had to be changed to enlarge certain fields for other
 languages (rather than overriding sizes in each of several other languages).
 Still need to translate new create_account_text and verify guessed
 log_in_text.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 64ecdbf752..89a8781e27 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -42,7 +42,7 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="865"
+width="900"
 min_width="865"
 height="80">
 <text
@@ -168,7 +168,7 @@ height="16"
 name="forgot_password_text"
 top="35"
 left="630"
-  width="200">
+  width="280">
        Forgot your username or password?
 </text>
 <button
@@ -194,7 +194,7 @@ height="16"
 label="Remember password"
   top_pad="3"
   name="remember_check"
- width="135" />
+ width="145" />
 </layout_panel>
 <layout_panel
 tab_stop="false"
-- 
cgit v1.2.3


From 5a1cbb1ef68a255074fdcb15815ca5aa4d3b5265 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 16 Jul 2012 21:59:13 -0400
Subject: Use question-mark-in-diamond for help, rather than skull&crossbones.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 89a8781e27..b26ec31c30 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -145,7 +145,7 @@ left="370"
 name="login_help"
 top="32"
 width="16">
- ☠
+ &#xFFFD;
 </text>
 <combo_box
 allow_text_entry="true"
-- 
cgit v1.2.3


From 149598bd57ad7a0e6703c49355c6d51ba4c55202 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 17 Jul 2012 16:24:58 -0400
Subject: Reinstate "Need help logging in?" link rather than question-diamond.
 Revert to corresponding original login_help text for each affected language.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index b26ec31c30..8a1dd6750b 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -135,18 +135,6 @@ name="MyHome"
 label="&lt;Type region name&gt;"
 name="Typeregionname"   value="" />
 </combo_box>
-<text
-follows="left|bottom"
-font="SansSerif"
-font.style="BOLD"
-font.size="Large"
-text_color="EmphasisColor"
-left="370"
-name="login_help"
-top="32"
-width="16">
- &#xFFFD;
-</text>
 <combo_box
 allow_text_entry="true"
 font="SansSerifSmall"
@@ -164,11 +152,20 @@ width="135"
 follows="left|bottom"
 font="SansSerifSmall"
 text_color="EmphasisColor"
+left="630"
+name="login_help"
+top="19"
+width="280">
+       Need help logging in?
+</text>
+<text
+follows="left|bottom"
+font="SansSerifSmall"
+text_color="EmphasisColor"
 height="16"
 name="forgot_password_text"
 top="35"
-left="630"
-  width="280">
+width="280">
        Forgot your username or password?
 </text>
 <button
-- 
cgit v1.2.3


From f7449bdc570e97a2ded2864779c72cce7f52e608 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 18 Jul 2012 14:47:16 -0400
Subject: Make "Log In" button (etc.) move with start/grid combo visibility.
 The "Start at:" combo box and the grid-selector box can be turned on and off
 with checkboxes on the Preferences floater. Break the bottom-left
 layout_panel on panel_login into several different layout_panels so when
 these UI elements disappear, other controls move left to fill the holes.
 Similarly, when you turn on either or both of the UI elements in question,
 the remaining controls in that general bottom-left area move right to
 accommodate. Tweak C++ and non-English panel_login.xml overrides to reflect
 widgets' containment in new layout_panel elements. Discard obsolete
 "mode_selection_text" and "mode_combo" translations from non- English
 panel_login.xml overrides.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 53 ++++++++++++++++------
 1 file changed, 39 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 8a1dd6750b..48f6a654d8 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -7,7 +7,7 @@ left="0"
 name="panel_login"
 focus_root="true" 
 top="600"
- width="996">
+ width="1130">
 <string name="reg_in_client_url" translate="false">
      http://secondlife.eniac15.lindenlab.com/reg-in-client/
 </string>
@@ -28,22 +28,23 @@ top="600"
   start_url=""
   top="0"
   height="600"
-  width="980"/>
+    width="996"/>
 <layout_stack
+animate="false"
 follows="left|bottom|right"
 name="login_widgets"
 layout="topleft"
 orientation="horizontal"
 top="519"
-width="996"
+width="1130"
 height="80">
 <layout_panel
 auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="900"
-min_width="865"
+width="310"
+min_width="310"
 height="80">
 <text
 follows="left|bottom"
@@ -104,11 +105,20 @@ is_password="true"
 select_on_focus="true"
   top_pad="0"
   width="135" />
+</layout_panel>
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="start_location_panel"
+layout="topleft"
+width="175"
+min_width="175"
+height="80">
 <text
 follows="left|bottom"
 font="SansSerifSmall"
 height="16"
-left="320"
+left="10"
 name="start_location_text"
 top="35"
 width="130">
@@ -135,24 +145,41 @@ name="MyHome"
 label="&lt;Type region name&gt;"
 name="Typeregionname"   value="" />
 </combo_box>
+</layout_panel>
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="grid_panel"
+layout="topleft"
+width="145"
+height="80"
+visible="false">
 <combo_box
 allow_text_entry="true"
 font="SansSerifSmall"
    follows="left|right|bottom"
    height="23"
    max_chars="256"
-left="490"
+left="10"
 top="51"
 layout="topleft"
 top_pad="2"
 name="server_combo"
-width="135"
-  visible="false" />
+width="135" />
+</layout_panel>
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="links_login_panel"
+layout="topleft"
+width="290"
+height="80">
 <text
 follows="left|bottom"
 font="SansSerifSmall"
 text_color="EmphasisColor"
-left="630"
+left="10"
+height="16"
 name="login_help"
 top="19"
 width="280">
@@ -171,21 +198,19 @@ width="280">
 <button
   follows="left|bottom"
   top_pad="0"
-  left="630"
   height="23"
   image_unselected="PushButton_On"
   image_selected="PushButton_On_Selected"
   label="Log In"
   label_color="White"
   layout="topleft"
-  left_pad="10"
   name="connect_btn"
   width="90" />
 <check_box
 control_name="RememberPassword"
 follows="left|bottom"
 font="SansSerifSmall"
-left="730"
+left="100"
 top="56"
 height="16"
 label="Remember password"
@@ -196,7 +221,7 @@ label="Remember password"
 <layout_panel
 tab_stop="false"
 follows="right|bottom"
-name="links"
+name="links" 
 width="210"
 min_width="210"
 height="80">
-- 
cgit v1.2.3


From 2a00ad07516b0626d6e3c875ced8a713d3a1ea15 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 19 Jul 2012 14:36:02 -0400
Subject: Move "remember password" checkbox right a few pixels

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 48f6a654d8..99d2595fde 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -210,7 +210,7 @@ width="280">
 control_name="RememberPassword"
 follows="left|bottom"
 font="SansSerifSmall"
-left="100"
+left="110"
 top="56"
 height="16"
 label="Remember password"
-- 
cgit v1.2.3


From 300662919e3fd5eb29b123fc555f176498e41a53 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 24 Jul 2012 08:54:01 -0400
Subject: Engage dormant first-login-this-install popup message. Although the
 XUI for this popup, and the code to display and respond to it, have been
 present from the first rev in the current viewer repository, I can find no
 trace of it ever having been called. Reword embedded link in popup message in
 each supported language: directly mentioning secondlife.com in display text
 engages anti-URL-spoofing logic, causing the popup to display the whole messy
 URL with sourceid and lang params. Change to say "Second Life web site"
 instead -- needs translations.

---
 indra/newview/skins/default/xui/en/notifications.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1e7aacd999..6ae458e691 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2803,7 +2803,8 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
 [APP_NAME] installation is complete.
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-Return to [[create_account_url] secondlife.com] to create a new account?
+
+Visit [[create_account_url] [SECOND_LIFE] web site] to create a new account?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
-- 
cgit v1.2.3


From 0f3c5e6458acdf1676f0b7a6dc42ed8cfa286cb0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 30 Jul 2012 14:54:44 -0400
Subject: line munging for merge warn-on-failure:unix-eol

---
 .../xui/en/floater_texture_fetch_debugger.xml      | 682 ++++++++++-----------
 1 file changed, 341 insertions(+), 341 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index f3f8d4ddca..44b6a63bca 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -1,341 +1,341 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- height="550"
- layout="topleft"
- name="TexFetchDebugger"
- help_topic="texfetchdebugger"
- title="Texture Fetching Debugger"
- width="540">
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left="10"
-   name="total_num_fetched_label"
-   top="30"
-   width="400">
-    1, Total number of fetched textures: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_fetching_requests_label"
-   top_delta="25"
-   width="400">
-    2, Total number of fetching requests: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_cache_hits_label"
-   top_delta="25"
-   width="400">
-    3, Total number of cache hits: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_visible_tex_label"
-   top_delta="25"
-   width="400">
-    4, Total number of visible textures: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_visible_tex_fetch_req_label"
-   top_delta="25"
-   width="450">
-    5, Total number of visible texture fetching requests: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_data_label"
-   top_delta="25"
-   width="530">
-    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_vis_data_label"
-   top_delta="25"
-   width="480">
-    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_rendered_data_label"
-   top_delta="25"
-   width="530">
-    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_cache_read_label"
-   top_delta="25"
-   width="400">
-    9, Total time on cache readings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_cache_write_label"
-   top_delta="25"
-   width="400">
-    10, Total time on cache writings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_decode_label"
-   top_delta="25"
-   width="400">
-    11, Total time on decodings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_gl_label"
-   top_delta="25"
-   width="400">
-    12, Total time on gl texture creation: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_http_label"
-   top_delta="25"
-   width="400">
-    13, Total time on HTTP fetching: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_fetch_label"
-   top_delta="25"
-   width="400">
-    14, Total time on entire fetching: [TIME] seconds
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_vis_cache_label"
-  top_delta="25"
-  width="540">
-    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_vis_http_label"
-  top_delta="25"
-  width="540">
-    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <spinner
-     decimal_digits="2"
-     follows="left|top"
-     height="20"
-     increment="0.01"
-     initial_value="1.0"
-     label="17, Ratio of Texel/Pixel:"
-     label_width="130"
-     layout="topleft"
-     left_delta="0"
-     max_val="10.0"
-     min_val="0.01"
-     name="texel_pixel_ratio"
-     top_delta="30"
-     width="200">
-    <spinner.commit_callback
-		function="TexFetchDebugger.ChangeTexelPixelRatio" />
-  </spinner>
-  <button
-   follows="left|top"
-   height="20"
-   label="Start"
-   layout="topleft"
-   left_delta="0"
-   name="start_btn"
-   top_delta="30"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Start" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Reset"
-   layout="topleft"
-   left_pad="7"
-   name="clear_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Clear" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Close"
-   layout="topleft"
-   left_pad="7"
-   name="close_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Close" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Cache Read"
-   layout="topleft"
-   left="10"
-   name="cacheread_btn"
-   top_delta="30"
-   width="80">
-    <button.commit_callback
-		function="TexFetchDebugger.CacheRead" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Cache Write"
-   layout="topleft"
-   left_pad="7"
-   name="cachewrite_btn"
-   top_delta="0"
-   width="80">
-    <button.commit_callback
-		function="TexFetchDebugger.CacheWrite" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="http_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.HTTPLoad" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Decode"
-   layout="topleft"
-   left_pad="7"
-   name="decode_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Decode" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="GL Texture"
-   layout="topleft"
-   left_pad="7"
-   name="gl_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.GLTexture" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch Vis Cache"
-   layout="topleft"
-   left="10"
-   name="refetchviscache_btn"
-   top_delta="30"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchVisCache" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch Vis HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="refetchvishttp_btn"
-   top_delta="0"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchVisHTTP" />
-  </button>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="550"
+ layout="topleft"
+ name="TexFetchDebugger"
+ help_topic="texfetchdebugger"
+ title="Texture Fetching Debugger"
+ width="540">
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left="10"
+   name="total_num_fetched_label"
+   top="30"
+   width="400">
+    1, Total number of fetched textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_fetching_requests_label"
+   top_delta="25"
+   width="400">
+    2, Total number of fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_cache_hits_label"
+   top_delta="25"
+   width="400">
+    3, Total number of cache hits: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_label"
+   top_delta="25"
+   width="400">
+    4, Total number of visible textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_fetch_req_label"
+   top_delta="25"
+   width="450">
+    5, Total number of visible texture fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_data_label"
+   top_delta="25"
+   width="530">
+    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_vis_data_label"
+   top_delta="25"
+   width="480">
+    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_rendered_data_label"
+   top_delta="25"
+   width="530">
+    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_read_label"
+   top_delta="25"
+   width="400">
+    9, Total time on cache readings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_write_label"
+   top_delta="25"
+   width="400">
+    10, Total time on cache writings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_decode_label"
+   top_delta="25"
+   width="400">
+    11, Total time on decodings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_gl_label"
+   top_delta="25"
+   width="400">
+    12, Total time on gl texture creation: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_http_label"
+   top_delta="25"
+   width="400">
+    13, Total time on HTTP fetching: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_fetch_label"
+   top_delta="25"
+   width="400">
+    14, Total time on entire fetching: [TIME] seconds
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_cache_label"
+  top_delta="25"
+  width="540">
+    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_http_label"
+  top_delta="25"
+  width="540">
+    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <spinner
+     decimal_digits="2"
+     follows="left|top"
+     height="20"
+     increment="0.01"
+     initial_value="1.0"
+     label="17, Ratio of Texel/Pixel:"
+     label_width="130"
+     layout="topleft"
+     left_delta="0"
+     max_val="10.0"
+     min_val="0.01"
+     name="texel_pixel_ratio"
+     top_delta="30"
+     width="200">
+    <spinner.commit_callback
+		function="TexFetchDebugger.ChangeTexelPixelRatio" />
+  </spinner>
+  <button
+   follows="left|top"
+   height="20"
+   label="Start"
+   layout="topleft"
+   left_delta="0"
+   name="start_btn"
+   top_delta="30"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Start" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Reset"
+   layout="topleft"
+   left_pad="7"
+   name="clear_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Clear" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Close"
+   layout="topleft"
+   left_pad="7"
+   name="close_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Close" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Read"
+   layout="topleft"
+   left="10"
+   name="cacheread_btn"
+   top_delta="30"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheRead" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Write"
+   layout="topleft"
+   left_pad="7"
+   name="cachewrite_btn"
+   top_delta="0"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheWrite" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="http_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.HTTPLoad" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Decode"
+   layout="topleft"
+   left_pad="7"
+   name="decode_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Decode" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="GL Texture"
+   layout="topleft"
+   left_pad="7"
+   name="gl_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.GLTexture" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis Cache"
+   layout="topleft"
+   left="10"
+   name="refetchviscache_btn"
+   top_delta="30"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisCache" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="refetchvishttp_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisHTTP" />
+  </button>
+</floater>
-- 
cgit v1.2.3


From df767cef781c9bf7a64f892918f07e5f463d5df0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 2 Aug 2012 16:04:39 -0400
Subject: Manual cleanup from merge up to viewer-development. Some
 viewer-development code had been moved, and so wasn't patched with my
 panel_login layout changes; verified each of my llpanellogin.cpp commits
 against new tip rev. Reformatted panel_login.xml in the spirit of the
 preferred indentation scheme but with my layout changes.

---
 indra/newview/skins/default/xui/en/panel_login.xml | 232 ++++++++++-----------
 1 file changed, 116 insertions(+), 116 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 6ba3279be6..9c96143aa3 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -7,7 +7,7 @@
     name="panel_login"
     focus_root="true" 
     top="600"
- width="1130">
+    width="1130">
   <string name="reg_in_client_url" translate="false">
     http://secondlife.eniac15.lindenlab.com/reg-in-client/
   </string>
@@ -28,43 +28,43 @@
       start_url=""
       top="0"
       height="600"
-    width="996"/>
+      width="996"/>
   <layout_stack
-animate="false"
+      animate="false"
       follows="left|bottom|right"
       name="login_widgets"
       layout="topleft"
       orientation="horizontal"
       top="519"
-width="1130"
+      width="1130"
       height="80">
     <layout_panel
         auto_resize="false"
         follows="left|bottom"
         name="login"
         layout="topleft"
-width="310"
-min_width="310"
+        width="310"
+        min_width="310"
         height="80">
       <text
           follows="left|bottom"
-font="SansSerif"
-font.style="BOLD"
-font.size="Large"
-height="16"
-name="log_in_text"
-top="8"
-left="15"
-width="150">
-LOG IN
-</text>
-<text
-follows="left|bottom"
+          font="SansSerif"
+          font.style="BOLD"
+          font.size="Large"
+          height="16"
+          name="log_in_text"
+          top="8"
+          left="15"
+          width="150">
+        LOG IN
+      </text>
+      <text
+          follows="left|bottom"
           font="SansSerifSmall"
           height="16"
           name="username_text"
-top="35"
-left="15"
+          top="35"
+          left="15"
           width="150">
         Username:
       </text>
@@ -89,10 +89,10 @@ left="15"
       <text
           follows="left|bottom"
           font="SansSerifSmall"
-height="16"
+          height="16"
           name="password_text"
-top="35"
-left="175"
+          top="35"
+          left="175"
           width="150">
         Password:
       </text>
@@ -105,22 +105,22 @@ left="175"
           select_on_focus="true"
           top_pad="0"
           width="135" />
-</layout_panel>
-<layout_panel
-auto_resize="false"
-follows="left|bottom"
-name="start_location_panel"
-layout="topleft"
-width="175"
-min_width="175"
-height="80">
-<text
-follows="left|bottom"
-font="SansSerifSmall"
-height="16"
-left="10"
+    </layout_panel>
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="start_location_panel"
+        layout="topleft"
+        width="175"
+        min_width="175"
+        height="80">
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="16"
+          left="10"
           name="start_location_text"
-top="35"
+          top="35"
           width="130">
         Start at:
       </text>
@@ -128,7 +128,7 @@ top="35"
           allow_text_entry="true"
           control_name="NextLoginLocation"
           follows="left|bottom"
-  height="22"
+          height="22"
           max_chars="128"
           top_pad="0"
           name="start_location_combo"
@@ -145,112 +145,112 @@ top="35"
             label="&lt;Type region name&gt;"
             name="Typeregionname"   value="" />
       </combo_box>
-</layout_panel>
-<layout_panel
-auto_resize="false"
-follows="left|bottom"
-name="grid_panel"
-layout="topleft"
-width="145"
-height="80"
-visible="false">
+    </layout_panel>
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="grid_panel"
+        layout="topleft"
+        width="145"
+        height="80"
+        visible="false">
       <combo_box
           allow_text_entry="false"
           font="SansSerifSmall"
           follows="left|right|bottom"
           height="23"
           max_chars="256"
-left="10"
-top="51"
+          left="10"
+          top="51"
           layout="topleft"
           top_pad="2"
           name="server_combo"
-width="135" />
+          width="135" />
     </layout_panel>
     <layout_panel
-auto_resize="false"
-follows="left|bottom"
-name="links_login_panel"
-layout="topleft"
-width="290"
+        auto_resize="false"
+        follows="left|bottom"
+        name="links_login_panel"
+        layout="topleft"
+        width="290"
         height="80">
       <text
-follows="left|bottom"
+          follows="left|bottom"
           font="SansSerifSmall"
           text_color="EmphasisColor"
-left="10"
+          left="10"
           height="16"
-name="login_help"
-top="19"
-width="280">
-       Need help logging in?
+          name="login_help"
+          top="19"
+          width="280">
+        Need help logging in?
       </text>
       <text
-follows="left|bottom"
+          follows="left|bottom"
           font="SansSerifSmall"
           text_color="EmphasisColor"
           height="16"
           name="forgot_password_text"
-top="35"
-width="280">
+          top="35"
+          width="280">
         Forgot your username or password?
       </text>
-<button
-  follows="left|bottom"
-  top_pad="0"
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Log In"
-  label_color="White"
-  layout="topleft"
-  name="connect_btn"
-  width="90" />
-<check_box
-control_name="RememberPassword"
-follows="left|bottom"
-font="SansSerifSmall"
-left="110"
-top="56"
-height="16"
-label="Remember password"
-  top_pad="3"
-  name="remember_check"
- width="145" />
-</layout_panel>
-<layout_panel
-tab_stop="false"
-follows="right|bottom"
-name="links" 
-width="210"
-min_width="210"
-height="80">
+      <button
+          follows="left|bottom"
+          top_pad="0"
+          height="23"
+          image_unselected="PushButton_On"
+          image_selected="PushButton_On_Selected"
+          label="Log In"
+          label_color="White"
+          layout="topleft"
+          name="connect_btn"
+          width="90" />
+      <check_box
+          control_name="RememberPassword"
+          follows="left|bottom"
+          font="SansSerifSmall"
+          left="110"
+          top="56"
+          height="16"
+          label="Remember password"
+          top_pad="3"
+          name="remember_check"
+          width="145" />
+    </layout_panel>
+    <layout_panel
+        tab_stop="false"
+        follows="right|bottom"
+        name="links" 
+        width="210"
+        min_width="210"
+        height="80">
       <text
           follows="right|bottom"
-font="SansSerif"
-font.style="BOLD"
-font.size="Large"
+          font="SansSerif"
+          font.style="BOLD"
+          font.size="Large"
           halign="right"
           height="16"
-name="create_account_text"
-top="8"
-right="-15"
+          name="create_account_text"
+          top="8"
+          right="-15"
           width="200">
-CREATE YOUR ACCOUNT
-</text>
-<button
-  follows="right|bottom"
-  top="35"
-  right="-15"
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Start now"
-  label_color="White"
-  layout="topleft"
-  left_pad="10"
-  name="create_new_account_btn"
-  width="90" />
+        CREATE YOUR ACCOUNT
+      </text>
+      <button
+          follows="right|bottom"
+          top="35"
+          right="-15"
+          height="23"
+          image_unselected="PushButton_On"
+          image_selected="PushButton_On_Selected"
+          label="Start now"
+          label_color="White"
+          layout="topleft"
+          left_pad="10"
+          name="create_new_account_btn"
+          width="90" />
     </layout_panel>
   </layout_stack>
 </panel>
-- 
cgit v1.2.3


From c77c43ae98eb3e712ef5c576824a6528b41f82c0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 3 Aug 2012 15:33:07 -0400
Subject: Make first-login popup button "Create Account"; remove embedded link.
 Popup text used to end with the question: Visit [[create_account_url]
 [SECOND_LIFE] web site] to create a new account? presumably to set context
 for the buttons labeled "New Account..." and "Continue". At Leo's request,
 remove the question and relabel the yes button "Create Account...".

---
 indra/newview/skins/default/xui/en/notifications.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e48bbd1369..7da676dae8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2928,13 +2928,11 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
 [APP_NAME] installation is complete.
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-
-Visit [[create_account_url] [SECOND_LIFE] web site] to create a new account?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
      notext="Continue"
-     yestext="New Account..."/>
+     yestext="Create Account..."/>
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 828374749682a5febc6ebac81321e80dee11085e Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Mon, 12 Nov 2012 16:25:35 +0200
Subject: CHUI-386 FIXED Vertical scrollbar not fully showing in conversation
 message panel

---
 .../skins/default/xui/en/floater_im_session.xml    | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

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 a889eb7933..1d74f1bc25 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -203,7 +203,7 @@
              name="translate_chat_checkbox_lp"
              top_delta="0"
              visible="true"
-             width="230">
+             width="210">
                 <check_box
                  top="10"
                  control_name="TranslateChat"
@@ -217,7 +217,7 @@
             </layout_panel>
             <layout_panel
              height="248"
-             width="230"
+             width="210"
              layout="topleft"
              follows="all"
              left_delta="0"
@@ -227,17 +227,17 @@
              user_resize="true"
              auto_resize="true"
              name="chat_holder">      
-        <chat_history
-	 font="SansSerifSmall"
-             		follows="all"
-             		visible="true"
-             		height="240"
-         name="chat_history"
-         parse_highlights="true"
-         parse_urls="true"
-       	 width="230"
-       	 left="5">
-        </chat_history>
+               <chat_history
+                font="SansSerifSmall"
+                follows="all"
+                visible="true"
+                height="240"
+                name="chat_history"
+                parse_highlights="true"
+                parse_urls="true"
+                right="-5"
+                left="5">
+               </chat_history>
             </layout_panel>
            </layout_stack>
            </panel>
-- 
cgit v1.2.3


From 3d42133ecb7671d8284bc0309f8df9e6e7f2df9c Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Fri, 9 Nov 2012 17:04:21 +0200
Subject: CHUI-362 WIP (Torn off conversation name is highlighted when selected
 in conversation list with different conversation showing in message panel):
 implemented the stub panel and a control of it's visibility

---
 .../skins/default/xui/en/floater_im_container.xml  | 42 +++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 590ce45c33..e3db3d52ed 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -124,7 +124,47 @@
              left="0"
              name="im_box_tab_container"
              top="0"
-             width="412"/>
+             width="412">
+             <panel
+               follows="all"
+               layout="topleft"
+               name="stub_panel"
+               opaque="true"
+               top_pad="0"
+               left="0"
+               height="430"
+               width="412">
+                 <text
+                   type="string"
+                   clip_partial="false"
+                   follows="left|top"
+                   layout="topleft"
+                   left="20"
+                   right="-20"
+                   name="stub_textbox_1"
+                   top="10"
+                   height="20"
+                   valign="center"
+                   wrap="true">
+                   This conversation is in a separate window.
+                 </text>
+                 <text
+                   type="string"
+                   clip_partial="false"
+                   follows="left|top"
+                   layout="topleft"
+                   left="20"
+                   right="-20"
+                   name="stub_textbox_2"
+                   top="40"
+                   height="20"
+                   valign="center"
+                   parse_urls="false"
+                   wrap="true">
+                     Bring it back.
+                </text>
+             </panel>
+            </panel_container>
         </layout_panel>
     </layout_stack>
 </multi_floater>
-- 
cgit v1.2.3


From ab5a0a1d4d0a029dd92c9fc108638736a57ce7c6 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Mon, 12 Nov 2012 15:06:42 +0200
Subject: CHUI-362 FIXED (Torn off conversation name is highlighted when
 selected in conversation list with different conversation showing in message
 panel): connect new method "returnFloaterToHost" to click on quasi-URL "Bring
 it back"

---
 indra/newview/skins/default/xui/en/floater_im_container.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e3db3d52ed..1388b9e474 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -159,9 +159,9 @@
                    top="40"
                    height="20"
                    valign="center"
-                   parse_urls="false"
+                   parse_urls="true"
                    wrap="true">
-                     Bring it back.
+                     [secondlife:/// Bring it back.]
                 </text>
              </panel>
             </panel_container>
-- 
cgit v1.2.3