Polish web content floater - rename to reflect it now does all media. remove developer options when Develop menu closed. start at google home page by default.

3 files changed, 73 insertions, 66 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 7b63a67415..4473ce0cda 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -25,10 +25,10 @@
     <layout_panel
       auto_resize="false"
       default_tab_group="1"
-      height="44"
+      height="22"
       layout="topleft"
       left="0"
-      min_height="40"
+      min_height="20"
       name="nav_controls"
       top="400"
       width="770">
@@ -152,112 +152,136 @@
         <button.commit_callback
           function="WebContent.PopExternal" />
       </button>
+    </layout_panel>
+    <layout_panel
+     height="22"
+     layout="topleft"
+     left_delta="0"
+     name="debug_controls"
+     top_delta="0"
+     auto_resize="false"
+     width="585">
+      <button
+        image_overlay="Home_Off"
+            image_disabled="PushButton_Disabled"
+            image_disabled_selected="PushButton_Disabled"
+            image_selected="PushButton_Selected"
+            image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Web tests home page"
+        enabled="true"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="1"
+        name="web_test_home_page"
+        top="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.TestURL"
+          parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/>
+      </button>
 
       <button
         image_overlay="Video_URL_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
+            image_disabled="PushButton_Disabled"
+            image_disabled_selected="PushButton_Disabled"
+            image_selected="PushButton_Selected"
+            image_unselected="PushButton_Off"
         chrome="true"
         tool_tip="MPEG4 Video Test"
         enabled="true"
         follows="left|top"
         height="22"
         layout="topleft"
-        left="1"
+        left="27"
         name="VLC Plugin Test"
-        top="22"
+        top="0"
         width="22">
         <button.commit_callback
-          function="WebContent.TestVideo"
+          function="WebContent.TestURL"
           parameter="https://callum-linden.s3.amazonaws.com/sample_media/ss.mp4"/>
       </button>
-
       <button
         image_overlay="Video_URL_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
+            image_disabled="PushButton_Disabled"
+            image_disabled_selected="PushButton_Disabled"
+            image_selected="PushButton_Selected"
+            image_unselected="PushButton_Off"
         chrome="true"
         tool_tip="MKV Video Test"
         enabled="true"
         follows="left|top"
         height="22"
         layout="topleft"
-        left="27"
+        left="51"
         name="VLC Plugin Test"
-        top="22"
+        top="0"
         width="22">
         <button.commit_callback
-          function="WebContent.TestVideo"
+          function="WebContent.TestURL"
           parameter="https://callum-linden.s3.amazonaws.com/sample_media/jellyfish.mkv"/>
       </button>
-
       <button
         image_overlay="Video_URL_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
+            image_disabled="PushButton_Disabled"
+            image_disabled_selected="PushButton_Disabled"
+            image_selected="PushButton_Selected"
+            image_unselected="PushButton_Off"
         chrome="true"
         tool_tip="WebM Video Test"
         enabled="true"
         follows="left|top"
         height="22"
         layout="topleft"
-        left="51"
+        left="75"
         name="VLC Plugin Test"
-        top="22"
+        top="0"
         width="22">
         <button.commit_callback
-          function="WebContent.TestVideo"
+          function="WebContent.TestURL"
           parameter="https://callum-linden.s3.amazonaws.com/sample_media/jumprope.webm"/>
       </button>
-
       <button
         image_overlay="Video_URL_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
+            image_disabled="PushButton_Disabled"
+            image_disabled_selected="PushButton_Disabled"
+            image_selected="PushButton_Selected"
+            image_unselected="PushButton_Off"
         chrome="true"
         tool_tip="MP3 audio Test"
         enabled="true"
         follows="left|top"
         height="22"
         layout="topleft"
-        left="75"
+        left="99"
         name="VLC Plugin Test"
-        top="22"
+        top="0"
         width="22">
         <button.commit_callback
-          function="WebContent.TestVideo"
+          function="WebContent.TestURL"
           parameter="https://callum-linden.s3.amazonaws.com/alegria.mp3"/>
       </button>
-
       <button
         image_overlay="Video_URL_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
+            image_disabled="PushButton_Disabled"
+            image_disabled_selected="PushButton_Disabled"
+            image_selected="PushButton_Selected"
+            image_unselected="PushButton_Off"
         chrome="true"
         tool_tip="FLV Test"
         enabled="true"
         follows="left|top"
         height="22"
         layout="topleft"
-        left="99"
+        left="123"
         name="VLC Plugin Test"
-        top="22"
+        top="0"
         width="22">
         <button.commit_callback
-          function="WebContent.TestVideo"
+          function="WebContent.TestURL"
           parameter="https://callum-linden.s3.amazonaws.com/sample_media/vandal.flv"/>
       </button>
-
     </layout_panel>
     <layout_panel
       height="40"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 419ec359a6..4576111db1 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -232,11 +232,11 @@
              parameter="message_critical" />
         </menu_item_call>
       <menu_item_call
-       label="Web Content Floater Debug Test"
-       name="Web Content Floater Debug Test">
+       label="Media Browser"
+       name="Media Browser">
         <menu_item_call.on_click
          function="Advanced.WebContentTest"
-         parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/>
+         parameter="http://google.com"/>
       </menu_item_call>
       <menu
        create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0a492fb37b..82488cd88d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3141,30 +3141,13 @@
          label="UI"
          name="UI"
          tear_off="true">
-         <!--   <menu_item_check
-             label="New Bottom Bar"
-             name="New Bottom Bar">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="BottomPanelNew" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="BottomPanelNew" />
-            </menu_item_check>-->
-            <menu_item_call
-             label="Media Browser Test"
-             name="Web Browser Test">
-                <menu_item_call.on_click
-                 function="Advanced.WebBrowserTest"
-                 parameter="http://secondlife.com/app/search/slurls.html"/>
-            </menu_item_call>
           <menu_item_call
-           label="Web Content Browser"
-           name="Web Content Browser"
-           shortcut="control|shift|Z">
+           label="Media Browser"
+           name="Media Browser"
+           shortcut="control|alt|shift|Z">
             <menu_item_call.on_click
              function="Advanced.WebContentTest"
-             parameter="https://callum-linden.s3.amazonaws.com/ceftests.html"/>
+             parameter="http://google.com"/>
           </menu_item_call>
           <menu_item_call
            label="FB Connect Test"