diff options
| author | eli <none@none> | 2011-08-24 11:40:43 -0700 |
|---|---|---|
| committer | eli <none@none> | 2011-08-24 11:40:43 -0700 |
| commit | 5391410f89bfcc789702aab9fd0caeb21b399577 (patch) | |
| tree | cd9176cb582f4eece92f3f6c5d3999cc2c6c3d59 /indra/newview/skins/default/xui/en | |
| parent | 5eefd0d66d39dc4be2810a504146ee6e93cde51e (diff) | |
sync with viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en')
4 files changed, 7 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 01699955a6..b08e3abb71 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1250,16 +1250,6 @@ function="ToggleControl" parameter="QuietSnapshotsToDisk" /> </menu_item_check> - <menu_item_check - label="Compress Snapshots to Disk" - name="CompressSnapshotsToDisk"> - <menu_item_check.on_check - function="CheckControl" - parameter="CompressSnapshotsToDisk" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="CompressSnapshotsToDisk" /> - </menu_item_check> <menu_item_separator/> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 310616d57e..c9ccd44b83 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5903,7 +5903,7 @@ No valid parcel could be found. name="ObjectGiveItem" type="offer"> An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLURL] has given you this [OBJECTTYPE]: -[ITEM_SLURL] +<nolink>[ITEM_SLURL]</nolink> <form name="form"> <button index="0" 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 f51279adb4..23ad0e9528 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -81,7 +81,7 @@ follows="right|top" image_color="0 0 0 0" hover_glow_amount="0" - left_pad="2" + left_pad="5" top="0" width="55" height="18" @@ -94,14 +94,14 @@ font="SansSerifSmall" text_readonly_color="TimeTextColor" follows="right|top" - halign="right" + halign="center" height="16" top="5" layout="topleft" - left_pad="0" + left_pad="5" name="TimeText" tool_tip="Current time (Pacific)" - width="70"> + width="90"> 24:00 AM PST </text> <button @@ -112,7 +112,7 @@ image_pressed="Pause_Press" image_pressed_selected="Play_Press" is_toggle="true" - left_pad="15" + left_pad="10" top="1" name="media_toggle_btn" tool_tip="Start/Stop All Media (Music, Video, Web pages)" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f049f857f0..2094275bed 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3414,7 +3414,7 @@ Abuse Report</string> <string name="Female - Stick tougue out">Female - Stick tougue out</string> <string name="Female - Wow">Female - Wow</string> - <string name="/bow">/bow</string> + <string name="/bow1">/bow1</string> <string name="/clap">/clap</string> <string name="/count">/count</string> <string name="/extinguish">/extinguish</string> |