aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-07-15 02:02:57 -0700
committerMcCabe Maxsted2010-07-15 02:11:25 -0700
commit145c9172381f8bef303a86689b52dadf6a05975a (patch)
tree392b2cd85309d65c6eea98efd3a65bf96238554a /linden/indra/newview/skins
parentFixed #368: showlookatinfo notification missing, friendship and calling card ... (diff)
downloadmeta-impy-145c9172381f8bef303a86689b52dadf6a05975a.zip
meta-impy-145c9172381f8bef303a86689b52dadf6a05975a.tar.gz
meta-impy-145c9172381f8bef303a86689b52dadf6a05975a.tar.bz2
meta-impy-145c9172381f8bef303a86689b52dadf6a05975a.tar.xz
Fixed Bug #262: 'Help > Viewer Help' name does not match behavior (also fixed LLWeb::loadURL)
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_login.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index f1a8a54..454774e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -21,8 +21,8 @@
21 <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true" 21 <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
22 height="317" label="Help" left="80" mouse_opaque="false" name="Help" 22 height="317" label="Help" left="80" mouse_opaque="false" name="Help"
23 opaque="true" tear_off="false" width="166"> 23 opaque="true" tear_off="false" width="166">
24 <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0" 24 <menu_item_call bottom="-29" enabled="true" height="19" label="Grid Help" left="0"
25 mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166"> 25 mouse_opaque="true" name="Grid Help" shortcut="F1" width="166">
26 <on_click function="ShowFloater" userdata="help f1" /> 26 <on_click function="ShowFloater" userdata="help f1" />
27 </menu_item_call> 27 </menu_item_call>
28 <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence" left="0" 28 <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence" left="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index c969d3a..a02d033 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -799,7 +799,7 @@
799 799
800 <menu name="Help" create_jump_keys="true" label="Help" 800 <menu name="Help" create_jump_keys="true" label="Help"
801 opaque="true" tear_off="true"> 801 opaque="true" tear_off="true">
802 <menu_item_call name="Viewer Help" label="Viewer Help" 802 <menu_item_call name="Grid Help" label="Grid Help"
803 shortcut="F1"> 803 shortcut="F1">
804 <on_click function="ShowFloater" userdata="help f1" /> 804 <on_click function="ShowFloater" userdata="help f1" />
805 </menu_item_call> 805 </menu_item_call>