diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-31 09:05:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-31 09:05:06 -0400 |
| commit | 3416cf0da8dda8af2eff0bce091d2ba61eaf1e95 (patch) | |
| tree | a3b4bb108e409a22eb12517c7aa4c4a3d9001e64 | |
| parent | a2c59446663512df17324e3be5aee5dd5e0b269b (diff) | |
| parent | b918ef5e6fa5f24e5f7e62f50795bce7cb63196c (diff) | |
merge changes for storm-1574
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ce63c81793..f07559fc3a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -568,6 +568,7 @@ Jonathan Yap STORM-1462 STORM-1459 STORM-1522 + STORM-1574 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 0bc1be666e..83f1bff91f 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -117,12 +117,13 @@ label="Remember password" name="connect_btn" top="35" width="90" /> + <!-- Utf code in label is a filled up-pointing triangle --> <menu_button left_pad="5" top="35" width="80" height="23" - label="Mode ▲" + label="Mode ▲" name="mode_menu" 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" |