diff options
| author | Richard Linden <none@none> | 2011-05-25 18:14:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-25 18:14:55 -0700 |
| commit | 2595d53ded032964623007fa957510d5f1570e29 (patch) | |
| tree | 02b24547a3ca408298b58373f106bb9862fea4be /indra/newview/skins/default/xui/en | |
| parent | fda331bb801918aab3eb5b7026f7e868eca248a2 (diff) | |
| parent | 55a9991812a1f58774fe9b885f588dafcb52d2af (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/language_settings.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_login.xml | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml index c8a06fe401..51779e4bfd 100644 --- a/indra/newview/skins/default/xui/en/language_settings.xml +++ b/indra/newview/skins/default/xui/en/language_settings.xml @@ -4,6 +4,7 @@ <!-- Locale Information --> <string name="MicrosoftLocale">english</string> + <string name="MacLocale">C</string> <string name="DarwinLocale">C</string> <string name="LinuxLocale">C</string> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 0d4a095e14..4c4ff3e5c4 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -183,11 +183,11 @@ parameter="http://join.secondlife.com/"/> </menu_item_call> <menu_item_call - label="Web Content Floater Test" - name="Web Content Floater Test"> + label="Web Content Floater Debug Test" + name="Web Content Floater Debug Test"> <menu_item_call.on_click function="Advanced.WebContentTest" - parameter="http://www.google.com"/> + parameter="http://google.com"/> </menu_item_call> <menu_item_check label="Show Grid Picker" |