From b133ed1ae0d6f7d1dd3738174895231c9a7aea2b Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Tue, 8 Dec 2009 11:22:45 +0000
Subject: EXT-2427: Added an About > Report Bug menu

This menu brings up the Help Browser with the report_bug topic.

To support this, I've created a new ShowHelp function that can be
accessed from XUI. You can supply an optional help topic parameter,
or if you specify no parameter then the default (F1) help is shown.
---
 indra/newview/skins/default/xui/en/menu_login.xml  |  3 +--
 indra/newview/skins/default/xui/en/menu_viewer.xml | 11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index a22dc80f4e..9b439c16e0 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -45,8 +45,7 @@
          name="Second Life Help"
          shortcut="F1">
             <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="help f1" />
+             function="ShowHelp" />
         </menu_item_call>
         <menu_item_separator />
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 37136af680..2b3f3c79e0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1060,8 +1060,7 @@
          name="Second Life Help"
          shortcut="F1">
             <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="help f1" />
+             function="ShowHelp" />
         </menu_item_call>
         <menu_item_call
          label="Tutorial"
@@ -1081,6 +1080,14 @@
                  function="ShowFloater"
                  parameter="complaint reporter" />
             </menu_item_call>
+        <menu_item_call
+             label="Report Bug"
+             layout="topleft"
+             name="Report Bug">
+                <menu_item_call.on_click
+                 function="ShowHelp"
+                 parameter="report_bug" />
+            </menu_item_call>
         <menu_item_separator
              layout="topleft" />
         <menu_item_call
-- 
cgit v1.2.3