diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:39:49 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-17 12:39:49 +0100 |
commit | 689fdd553c38ddef9c33f90c0b408bb2e9299742 (patch) | |
tree | b64aae5890112fe3c14c86acddc66cd872dcf223 /indra/newview/skins/default/xui/en | |
parent | 14f3b77b9c4103f324d24625bd30dd106ab1817f (diff) | |
parent | 3f10caafc07b0d1a60d2b943684e87dec265f5bc (diff) |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en')
4 files changed, 14 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index bd9925be1d..e94af2c8d5 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml @@ -15,7 +15,7 @@ follows="left|top|right|bottom" height="176" layout="topleft" - max_length="10000" + max_length="2147483647" name="Chat History Editor" parse_highlights="true" width="420" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 25e10114b0..4b8f897bf6 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5973,6 +5973,13 @@ The button will be shown when there is enough space for it. </notification> <notification + icon="notifytip.tga" + name="ShareNotification" + type="notifytip"> +Drag items from inventory onto a person in the resident picker + </notification> + + <notification name="MeshUploadError" icon="alert.tga" type="alert"> @@ -5981,11 +5988,10 @@ The button will be shown when there is enough space for it. <notification icon="notifytip.tga" - name="ShareNotification" + name="AvatarRezNotification" type="notifytip"> -Drag items from inventory onto a person in the resident picker +Avatar '[NAME]' rezzed in [TIME] seconds. </notification> - <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. </global> diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index 8042563900..19eb4bb0d6 100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml @@ -110,7 +110,6 @@ increment="1" initial_value="0" label="[DESC]" - label_width="100" layout="bottom|left" left="6" max_val="100" 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 c2624ce0d0..690d2971ee 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -99,7 +99,7 @@ image_pressed="Pause_Press" image_pressed_selected="Play_Press" is_toggle="true" - left_pad="20" + left_pad="15" top="1" name="media_toggle_btn" tool_tip="Start/Stop All Media (Music, Video, Web pages)" @@ -112,12 +112,12 @@ image_pressed="Audio_Press" image_unselected="Audio_Off" is_toggle="true" - left_pad="10" + left_pad="5" top="2" name="volume_btn" tool_tip="Global Volume Control" width="16" /> - <!-- <text + <text follows="right|top" halign="center" height="12" @@ -125,5 +125,5 @@ left_delta="0" name="stat_btn" top_delta="0" - width="20"/>--> + width="20"/> </panel> |