diff options
author | Oz Linden <oz@lindenlab.com> | 2011-06-04 07:50:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-06-04 07:50:12 -0400 |
commit | 2c9a914d7d45b056c845f5b7dba6713ff5c597ae (patch) | |
tree | f51dc1ff803a43e980c574d556076eed8717e161 /indra/newview/skins/default/xui/en | |
parent | 19250ff490eba3ef5e713e10eed4243150691f25 (diff) | |
parent | d034bdcae74225af23ae29fbe9ba4a78ac7de5a7 (diff) |
merge changes for storm-1318
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" |