From 872e4dcdde979981d35889152dbee827775c4b7c Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Sat, 11 Dec 2010 18:54:33 +0200
Subject: STORM-766 ADDITIONAL FIX Made day cycle image in the advanced sky
 editor honor floater opacity settings.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 85a5be369c..249ad95c41 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -594,6 +594,7 @@
              left_delta="14"
              top_pad="10"
              name="SkyDayCycle"
+             use_draw_context_alpha="false"
              width="148" />
             <slider
              control_name="WLSunAngle"
-- 
cgit v1.2.3


From 29dc24a3ea8d6f3d3aa83fd6b22921937d0dd430 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 14 Dec 2010 14:53:51 +0200
Subject: STORM-713 FIXED XML/UI issues in llTextBox

- As the class LLToastNotifyPanel is deprecated, made the class LLToastScriptTextbox derived directly from LLToastPanel.

- Added callback for ignore button.

Now LLToastScriptTextbox has its own XML, therefore it's not needed to dynamically create toast panel.

Since LLToastNotifyPanel is deprecated all new notification toasts should be created this way.
---
 .../skins/default/xui/en/panel_notify_textbox.xml  | 66 +++++++++++++++-------
 1 file changed, 46 insertions(+), 20 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
index 4634eeed46..d5b6057233 100644
--- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
    background_visible="true"
-   height="230"
+   height="220"
    label="instant_message"
    layout="topleft"
    left="0"
@@ -14,55 +14,81 @@
   <panel
    bevel_style="none"
    follows="left|right|top"
-   height="150"
+   height="185"
    label="info_panel"
    layout="topleft"
    left="0"
    name="info_panel"
    top="0"
-   width="305">
+   width="305">    
+    <text_editor
+     bg_readonly_color="0.0 0.0 0.0 0"
+     enabled="false"
+     follows="left|right|top|bottom"
+     font="SansSerif"
+     height="110" 
+     layout="topleft"
+     left="10"
+     mouse_opaque="false"
+     name="text_editor_box"
+     read_only="true"
+     text_color="white"
+     text_readonly_color="white"
+     top="10"
+     width="285"
+     wrap="true"
+     parse_highlights="true"
+     parse_urls="true"/>
     <text_editor
      parse_urls="true"
      enabled="true"
      follows="all"
-     height="60"
+     height="50"
      layout="topleft"
-     left="25"
+     left="10"
      max_length="250"
      name="message"
      parse_highlights="true"
      read_only="false"
-     top="40"
+     top_pad="10"
      type="string"
      use_ellipses="true"
      value="message"
-     width="260"
-     word_wrap="true" >
+     width="285"
+     word_wrap="true"
+     parse_url="false" >
     </text_editor>
-     parse_urls="false"
-    <button
-     top="110"
-     follows="top|left"
-     height="20"
-     label="Submit"
-     layout="topleft"
-     left="25"
-     name="btn_submit"
-     width="70" />
   </panel>
   <panel
      background_visible="false"
      follows="left|right|bottom"
-     height="0" 
+     height="25" 
      width="290"
      label="control_panel"
      layout="topleft"
      left="10"
      name="control_panel"
-     top_pad="5">
+     top_pad="0">
     <!-- 
 	 Notes:
 	 This panel holds the Ignore button and possibly other buttons of notification.
       -->
+    <button
+     top="0"
+     follows="top|left"
+     height="20"
+     label="Submit"
+     layout="topleft"
+     name="btn_submit"
+     width="70" />
+    <button
+     follows="top|right"
+     height="20"
+     label="Ignore"
+     layout="topleft"
+     left="215"
+     name="ignore_btn"
+     top="0"
+     width="70" />
   </panel>
 </panel>
-- 
cgit v1.2.3


From a702b34394e4b38b27338eb6d68d22b498984118 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 14 Dec 2010 17:11:08 +0200
Subject: STORM-352 FIXED Vertical scrollbar isn't reshaped in resident profile
 panel after decreasing panel height

- Set height of scroll container the same as bounding panel's height
---
 indra/newview/skins/default/xui/en/panel_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 7caf425058..61e3bb354f 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -59,7 +59,7 @@
          left="0"
          name="profile_scroll"
          opaque="true"
-         height="527"
+         height="400"
          width="317"
          top="0">
           <panel
-- 
cgit v1.2.3