From 522bcf17b759910040225c209f7851fbb0640c56 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 30 Nov 2010 20:52:30 -0800
Subject: SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be
 useful for viewer web apps

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 796b15551a..e98cdb0ccf 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2615,7 +2615,14 @@
                  function="Advanced.WebBrowserTest"
                  parameter="http://secondlife.com/app/search/slurls.html"/>
             </menu_item_call>
-            <menu_item_call
+          <menu_item_call
+           label="Web Content Browser Test"
+           name="Web Content Browser Test">
+            <menu_item_call.on_click
+             function="Advanced.WebContentTest"
+             parameter="http://secondlife.com/app/search/slurls.html"/>
+          </menu_item_call>
+          <menu_item_call
              label="Dump SelectMgr"
              name="Dump SelectMgr">
                 <menu_item_call.on_click
-- 
cgit v1.2.3


From 52ff7420fdd6c41211174720e4c07b35f61d81c2 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 6 Dec 2010 17:12:43 -0800
Subject: SOCIAL-342 FIX Rename Web Browser Test option in debug menus to
 reflect the fact it opens the Media browser

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 9ac811971e..20f40d8316 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2623,7 +2623,7 @@
                  parameter="BottomPanelNew" />
             </menu_item_check>-->
             <menu_item_call
-             label="Web Browser Test"
+             label="Media Browser Test"
              name="Web Browser Test">
                 <menu_item_call.on_click
                  function="Advanced.WebBrowserTest"
-- 
cgit v1.2.3


From 51e53849f0dd7f8ce8439e833d6d99a59c0f2ee0 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 16 Dec 2010 15:39:19 -0800
Subject: SOCIAL-393 FIX Need a keyboard shortcut to open the Web Content
 floater

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 20f40d8316..680a9d174f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2630,11 +2630,12 @@
                  parameter="http://secondlife.com/app/search/slurls.html"/>
             </menu_item_call>
           <menu_item_call
-           label="Web Content Browser Test"
-           name="Web Content Browser Test">
+           label="Web Content Browser"
+           name="Web Content Browser"
+           shortcut="control|alt|W">
             <menu_item_call.on_click
              function="Advanced.WebContentTest"
-             parameter="http://secondlife.com/app/search/slurls.html"/>
+             parameter="http://google.com"/>
           </menu_item_call>
           <menu_item_call
              label="Dump SelectMgr"
-- 
cgit v1.2.3