summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_status_bar.xml
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-08-18 17:52:00 -0400
committerLogan Dethrow <log@lindenlab.com>2011-08-18 17:52:00 -0400
commitce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch)
treef9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /indra/newview/skins/default/xui/en/panel_status_bar.xml
parent4fb809eed5fbed458b5be883fba7196a5712aa48 (diff)
parentb2ef0f99882db73680cc5dfb9570255414f7ba6d (diff)
Merge.
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_status_bar.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml14
1 files changed, 13 insertions, 1 deletions
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 d756dfb7de..f51279adb4 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -77,6 +77,18 @@
top="0"
width="55" />
</panel>
+ <menu_button
+ follows="right|top"
+ image_color="0 0 0 0"
+ hover_glow_amount="0"
+ left_pad="2"
+ top="0"
+ width="55"
+ height="18"
+ label="Mode ▼"
+ tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
+ menu_filename="menu_mode_change.xml"
+ />
<text
type="string"
font="SansSerifSmall"
@@ -89,7 +101,7 @@
left_pad="0"
name="TimeText"
tool_tip="Current time (Pacific)"
- width="145">
+ width="70">
24:00 AM PST
</text>
<button