diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-31 09:05:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-31 09:05:49 -0400 |
| commit | ee4fc00a2721ac402c278ed166fcb14661f4c720 (patch) | |
| tree | 4125bbbbb5fb2a649fb8c120ed42c834f6f2ef55 | |
| parent | 3416cf0da8dda8af2eff0bce091d2ba61eaf1e95 (diff) | |
| parent | d254c7eb5489df57647d2263162395bcb5fd7c1e (diff) | |
merge changes for storm-1572
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_status_bar.xml | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f07559fc3a..259de0bd74 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -568,6 +568,7 @@ Jonathan Yap STORM-1462 STORM-1459 STORM-1522 + STORM-1572 STORM-1574 Kadah Coba STORM-1060 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 23ad0e9528..f25a73da38 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -77,15 +77,16 @@ top="0" width="55" /> </panel> + <!-- UTF 9660 code in label below is a down-pointing filled-in triangle --> <menu_button follows="right|top" image_color="0 0 0 0" hover_glow_amount="0" left_pad="5" - top="0" + top="2" width="55" height="18" - label="Mode ▼" + 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" /> |