From c7098186151b4f7481fdb2ce33e5c326e899a086 Mon Sep 17 00:00:00 2001
From: skolb <none@none>
Date: Thu, 17 Dec 2009 11:54:35 -0800
Subject: Fixed carriage return text to use word wrap instead

---
 indra/newview/skins/default/xui/en/floater_about_land.xml            | 4 +---
 indra/newview/skins/default/xui/en/panel_media_settings_security.xml | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 1239152c32..a64716cb35 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1672,9 +1672,7 @@ Only large parcels can be listed in search.
              name="replace_texture_help"
              width="300"
              word_wrap="true">
-             Objects using this texture will show the movie or web page after you click the play arrow.
-
-Select the thumbnail to choose a different texture.
+             Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail to choose a different texture.
             </text>
             <check_box
              height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
index 1f41a0d284..a018e04bd1 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
@@ -81,10 +81,9 @@
    height="40"
    left="30"
    text_color="0.6 0.0 0.0 1.0"
+   word_wrap="true" 
    name="home_url_fails_whitelist">
-Warning: the home page specified in the General tab 
-fails to pass this whitelist. It has been disabled 
-until a valid entry has been added.
+Warning: the home page specified in the General tab fails to pass this whitelist. It has been disabled until a valid entry has been added.
   </text>
 
 </panel>
-- 
cgit v1.2.3


From cf4c5117336349ff25f2c49131e9e26dc7b50e38 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Thu, 17 Dec 2009 13:50:48 -0800
Subject: Change "url prefix" to "url pattern"

---
 indra/newview/skins/default/xui/en/panel_media_settings_security.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_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
index 1f41a0d284..e393df79e9 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
@@ -17,7 +17,7 @@
    font="SansSerifSmall"
    height="16" 
    initial_value="false"
-   label="Only Allow Access to Specified URLs (by prefix)" 
+   label="Only Allow Access to Specified URL patterns" 
    left="10" 
    mouse_opaque="true"
    name="whitelist_enable" 
-- 
cgit v1.2.3


From 5962d8804f19105d8f98372606745e3f9ec0bc27 Mon Sep 17 00:00:00 2001
From: Palmer Truelson <palmer@lindenlab.com>
Date: Fri, 18 Dec 2009 13:28:23 -0600
Subject: ext-3386 Fix for day cycle crash and xui cleanup

Reviewed by Richard
---
 .../default/xui/en/floater_day_cycle_options.xml   | 108 ++++++---------------
 1 file changed, 30 insertions(+), 78 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 35f3e643c3..8c5af2283d 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -65,11 +65,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL12am"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left="8"
              name="WL12am"
@@ -80,11 +78,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL3am"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left_pad="10"
              name="WL3am"
@@ -95,11 +91,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL6am"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left_pad="10"
              name="WL6am"
@@ -110,11 +104,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL9am"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left_pad="10"
              name="WL9amHash"
@@ -125,11 +117,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL12pm"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left_pad="10"
              name="WL12pmHash"
@@ -140,11 +130,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL3pm"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left_pad="10"
              name="WL3pm"
@@ -155,11 +143,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL6pm"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left_pad="10"
              name="WL6pm"
@@ -170,11 +156,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL9pm"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left_pad="10"
              name="WL9pm"
@@ -185,11 +169,9 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL12am2"
              follows="left|top|right"
-             height="6"
+             height="16"
              layout="topleft"
              left_pad="10"
              name="WL12am2"
@@ -200,9 +182,7 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL12amHash"
              follows="left|top|right"
              font="SansSerif"
              height="14"
@@ -210,135 +190,119 @@
              left="20"
              name="WL12amHash"
              top="54"
-             width="4">
+             width="6">
                 |
             </text>
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL3amHash"
              follows="left|top|right"
              font="SansSerif"
              height="11"
              layout="topleft"
-             left_pad="61"
+             left_pad="59"
              name="WL3amHash"
              top_delta="3"
-             width="4">
+             width="6">
                 I
             </text>
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL6amHash"
              follows="left|top|right"
              font="SansSerif"
              height="14"
              layout="topleft"
-             left_pad="61"
+             left_pad="59"
              name="WL6amHash"
              top_delta="-3"
-             width="4">
+             width="6">
                 |
             </text>
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL9amHash"
              follows="left|top|right"
              font="SansSerif"
              height="11"
              layout="topleft"
-             left_pad="61"
+             left_pad="59"
              name="WL9amHash2"
              top_delta="3"
-             width="4">
+             width="6">
                 I
             </text>
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL12pmHash"
              follows="left|top|right"
              font="SansSerif"
              height="14"
              layout="topleft"
-             left_pad="61"
+             left_pad="59"
              name="WL12pmHash2"
              top_delta="-3"
-             width="4">
+             width="6">
                 |
             </text>
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL3pmHash"
              follows="left|top|right"
              font="SansSerif"
              height="11"
              layout="topleft"
-             left_pad="61"
+             left_pad="59"
              name="WL3pmHash"
              top_delta="3"
-             width="4">
+             width="6">
                 I
             </text>
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL6pmHash"
              follows="left|top|right"
              font="SansSerif"
              height="14"
              layout="topleft"
-             left_pad="61"
+             left_pad="59"
              name="WL6pmHash"
              top_delta="-3"
-             width="4">
+             width="6">
                 |
             </text>
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL9pmHash"
              follows="left|top|right"
              font="SansSerif"
              height="11"
              layout="topleft"
-             left_pad="61"
+             left_pad="59"
              name="WL9pmHash"
              top_delta="3"
-             width="4">
+             width="6">
                 I
             </text>
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WL12amHash2"
              follows="left|top|right"
              font="SansSerif"
              height="14"
              layout="topleft"
-             left_pad="61"
+             left_pad="59"
              name="WL12amHash2"
              top_delta="-3"
-             width="4">
+             width="6">
                 |
             </text>
             <button
@@ -346,9 +310,9 @@
              label="Add Key"
              label_selected="Add Key"
              layout="topleft"
-             left="550"
+             left="555"
              name="WLAddKey"
-             top="20"
+             top="30"
              width="80" />
             <button
              height="20"
@@ -362,9 +326,7 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="DayCycleText"
              follows="left|top|right"
              font="SansSerif"
              height="16"
@@ -378,9 +340,7 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="DayCycleText"
              follows="left|top|right"
              font="SansSerif"
              height="16"
@@ -424,9 +384,7 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="WLCurKeyTimeText"
              follows="left|top|right"
              font="SansSerif"
              height="16"
@@ -456,9 +414,7 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="DayCycleText"
              follows="left|top|right"
              font="SansSerif"
              height="16"
@@ -481,9 +437,7 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="DayCycleText"
              follows="left|top|right"
              font="SansSerif"
              height="16"
@@ -542,9 +496,7 @@
             <text
              type="string"
              length="1"
-             bg_visible="true"
              border_visible="true"
-             control_name="DayCycleText"
              follows="left|top|right"
              font="SansSerif"
              height="16"
@@ -560,7 +512,7 @@
              label="Play"
              label_selected="Play"
              layout="topleft"
-             left_delta="0"
+             left_delta="60"
              name="WLAnimSky"
              top_pad="5"
              width="50" />
@@ -581,7 +533,7 @@
              left_pad="5"
              name="WLUseLindenTime"
              top_delta="0"
-             width="140" />
+             width="150" />
             <button
              height="20"
              label="Save Test Day"
-- 
cgit v1.2.3