summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-26 12:34:56 -0700
committerRichard Linden <none@none>2010-08-26 12:34:56 -0700
commit2667c77a1cfb230ade472a047f46fd2bde7883c0 (patch)
tree3df1b9ad247685aaaf32369301e1da043fcbb2d3 /indra/newview
parent74d4bbfa0a50df83a4fe419294609b6ef2af7a80 (diff)
parentead46208b02f31c8ed06242a016501d57c90abfb (diff)
Automated merge with ssh://richard@hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/textures/icons/pop_up_caution.pngbin0 -> 3158 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml2
-rw-r--r--indra/newview/skins/default/textures/windows/yellow_gradient.pngbin0 -> 3634 bytes
-rw-r--r--indra/newview/skins/default/xui/en/floater_help_browser.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_media_browser.xml71
-rw-r--r--indra/newview/skins/default/xui/en/floater_notifications_console.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_progress.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml1
9 files changed, 78 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/pop_up_caution.png b/indra/newview/skins/default/textures/icons/pop_up_caution.png
new file mode 100644
index 0000000000..78b681cb33
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/pop_up_caution.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 9fbbfb1d2b..8d6a564687 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -652,4 +652,6 @@ with the same filename but different name
<texture name="hint_arrow_up" file_name="windows/hint_arrow_up.png" preload="false"/>
<texture name="hint_arrow_down" file_name="windows/hint_arrow_down.png" preload="false"/>
+ <texture name="Yellow_Gradient" file_name="windows/yellow_gradient.png"/>
+ <texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/>
</textures>
diff --git a/indra/newview/skins/default/textures/windows/yellow_gradient.png b/indra/newview/skins/default/textures/windows/yellow_gradient.png
new file mode 100644
index 0000000000..5fd847aaef
--- /dev/null
+++ b/indra/newview/skins/default/textures/windows/yellow_gradient.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index 214fb6ce54..13017cc803 100644
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
@@ -24,6 +24,7 @@
follows="left|right|top|bottom"
layout="topleft"
left="5"
+ orientation="vertical"
name="stack1"
top="20"
width="640">
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index 18f3b9ab06..3b78da2a79 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -26,6 +26,7 @@
layout="topleft"
left="10"
name="stack1"
+ orientation="vertical"
top="20"
width="800">
<layout_panel
@@ -181,6 +182,76 @@
function="MediaBrowser.Assign" />
</button>
</layout_panel>
+ <layout_panel
+ height="30"
+ layout="topleft"
+ name="notification_area"
+ visible="false"
+ user_resize="false"
+ background_visible="true"
+ bg_alpha_image="Yellow_Gradient"
+ auto_resize="false"
+ width="800">
+ <layout_stack
+ top="0"
+ height="30"
+ width="800"
+ left="0"
+ follows="all"
+ orientation="horizontal"
+ >
+ <layout_panel
+ height="30">
+ <icon value="Popup_Caution"
+ left="5"
+ top="7"
+ width="16"
+ height="15"/>
+ <text left_pad="8"
+ top="10"
+ height="25"
+ width="400"
+ text_color="black"
+ font="SansSerifSmall"
+ font.style="BOLD"
+ name="notification_text"
+ value="Notification text here"
+ />
+ </layout_panel>
+ <layout_panel
+ height="30"
+ width="270"
+ auto_resize="false"
+ name="form_elements">
+ <check_box name="enable_check"
+ left="5"
+ top="5"
+ height="20"
+ width="120"
+ label="Enable all popups"
+ text_enabled_color="black"
+ />
+ <button left_pad="5"
+ width="140"
+ top="4"
+ label="Open pop-up window"/>
+ </layout_panel>
+ <layout_panel
+ height="30"
+ width="25"
+ auto_resize="false"
+ name="close_panel">
+ <button left="5"
+ name="close"
+ width="16"
+ height="16"
+ top="8"
+ image_color="DkGray_66"
+ image_unselected="Icon_Close_Foreground"
+ image_selected="Icon_Close_Press"/>
+ </layout_panel>
+ </layout_stack>
+ </layout_panel>
<layout_panel
height="40"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
index ca81b9bcf0..e243ccd2f9 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
@@ -36,6 +36,7 @@
follows="left|right|top|bottom"
layout="topleft"
left="5"
+ orientation="vertical"
name="notification_channels"
right="-5"
top="42" />
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index cf174da2f0..f5df177b68 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -183,6 +183,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
follows="all"
height="185"
width="313"
+ orientation="vertical"
layout="topleft"
name="filter_panels"
top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 727c5fb7b2..2868d91cc7 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -34,6 +34,7 @@
height="768"
layout="topleft"
left="0"
+ orientation="vertical"
name="stack2"
top="0"
width="640">
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index ab3cc036d5..e261d6d555 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -23,6 +23,7 @@
layout="topleft"
left_delta="0"
name="browser_layout"
+ orientation="vertical"
top_delta="0"
width="313">
<web_browser