1 files changed, 8 insertions, 5 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index d7f9809..2c45a4e 100755
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" color="0.501961 0 0 1" drop_shadow="true" enabled="true"
+<menu_bar bottom="-18" color="0.501961 0 0 1" drop_shadow="false" enabled="true"
      follows="left|top|right" height="18" hidden="false" left="0"
      mouse_opaque="true" name="Main Menu" opaque="true" tear_off="false"
      width="802">
@@ -37,6 +37,7 @@
                      left="0" mouse_opaque="true" name="Close Window" shortcut="control|W"
                      width="243">
                         <on_click function="File.CloseWindow" userdata="" />
+                        <on_enable function="File.EnableCloseWindow" userdata="" />
                 </menu_item_call>
                 <menu_item_separator bottom="-121" enabled="true" height="8" hidden="false" label="-----------"
                      left="0" mouse_opaque="true" name="separator2" width="243" />
@@ -509,6 +510,7 @@
                      left="0" mouse_opaque="true" name="Teleport Home"
                      shortcut="control|shift|H" width="185">
                         <on_click function="World.TeleportHome" userdata="" />
+                        <on_enable function="World.EnableTeleportHome" userdata="" />
                 </menu_item_call>
                 <menu_item_separator bottom="-167" enabled="true" height="8" hidden="false" label="-----------"
                      left="0" mouse_opaque="true" name="separator3" width="185" />
@@ -525,7 +527,8 @@
                 <menu_item_call bottom="-232" enabled="true" height="19" hidden="false"
                      label="Account History..." left="0" mouse_opaque="true"
                      name="Account History..." width="185">
-                        <on_click function="ShowFloater" userdata="account history" />
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
                 </menu_item_call>
                 <menu_item_call bottom="-267" enabled="true" height="19" hidden="false"
                      label="Manage My Account..." left="0" mouse_opaque="true"
@@ -811,10 +814,10 @@
                         <on_click function="PromptShowFile" userdata="WebLaunchLSLGuide,lsl_guide.html" />
                 </menu_item_call>
                 <menu_item_call bottom="-140" enabled="true" height="19" hidden="false"
-                     label="Scripting Wiki..." left="0" mouse_opaque="true"
-                     name="Scripting Wiki..." width="166">
+                     label="Scripting Portal..." left="0" mouse_opaque="true"
+                     name="Scripting Portal..." width="166">
                         <on_click function="PromptShowURL"
-                             userdata="WebLaunchLSLWiki,http://secondlife.com/app/lsldoc/" />
+                             userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
                 </menu_item_call>
                 <menu_item_separator bottom="-148" enabled="true" height="8" hidden="false" label="-----------"
                      left="0" mouse_opaque="true" name="separator3" width="166" />