llmediaplugins first step

1 files changed, 19 insertions, 15 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index fd6e842..7266dbc 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -40,7 +40,7 @@
 #include <sstream>
 
 // linden library includes
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "indra_constants.h"
 #include "llassetstorage.h"
 #include "llchat.h"
@@ -111,9 +111,8 @@
 #include "llfloatergroupinfo.h"
 #include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
-#include "llfloaterhtml.h"
 #include "llfloaterhtmlcurrency.h"
-#include "llfloaterhtmlhelp.h"                  // gViewerHtmlHelp
+#include "llfloatermediabrowser.h"                      // gViewerHtmlHelp
 #include "llfloaterhtmlsimple.h"
 #include "llfloaterhud.h"
 #include "llfloaterinspect.h"
@@ -158,6 +157,7 @@
 #include "lllineeditor.h"
 #include "llmenucommands.h"
 #include "llmenugl.h"
+#include "llmimetypes.h"
 #include "llmorphview.h"
 #include "llmoveview.h"
 #include "llmutelist.h"
@@ -934,6 +934,14 @@ void init_client_menu(LLMenuGL* menu)
                 menu->appendMenu( sub );
                 sub->createJumpKeys();
         }
+        {
+                LLMenuGL* sub = NULL;
+                sub = new LLMenuGL("Media");
+                sub->append(new LLMenuItemCallGL("Reload MIME types", &LLMIMETypes::reload));
+                sub->append(new LLMenuItemCallGL("Web Browser Test", &handle_web_browser_test));
+                menu->appendMenu( sub );
+                sub->createJumpKeys();
+        }
 
         menu->appendSeparator();
 
@@ -1063,6 +1071,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
         menu->appendSeparator();
 
         menu->append(new LLMenuItemCallGL("Web Browser Test", &handle_web_browser_test));
+
         // commented out until work is complete: DEV-32268
         // menu->append(new LLMenuItemCallGL("Buy Currency Test", &handle_buy_currency_test));
         menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
@@ -5493,6 +5502,7 @@ class LLWorldSetAway : public view_listener_t
                 if (gAgent.getAFK())
                 {
                         gAgent.clearAFK();
+                        llinfos << "Spawning HTML help window" << llendl;
                 }
                 else
                 {
@@ -6045,10 +6055,10 @@ class LLShowFloater : public view_listener_t
                 {
                         JCFloaterAnimList::toggleInstance(LLSD());
                 }
-                else if (floater_name == "inworld browser")
-                {
-                        LLFloaterMediaBrowser::toggleInstance(LLSD());
-                }
+//imprudence fixme              else if (floater_name == "inworld browser")
+//              {
+//                      LLFloaterMediaBrowser::toggle();
+//              }
                 else if (floater_name == "beacons")
                 {
                         LLFloaterBeacons::toggleInstance(LLSD());
@@ -7844,7 +7854,7 @@ void handle_grab_texture(void* data)
                         // user know that the image is now in inventory.
                         if(view)
                         {
-                                LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                                LLFocusableElement* focus_ctrl = gFocusMgr.getKeyboardFocus();
 
                                 view->getPanel()->setSelection(item_id, TAKE_FOCUS_NO);
                                 view->getPanel()->openSelected();
@@ -8048,13 +8058,7 @@ void handle_load_from_xml(void*)
 
 void handle_web_browser_test(void*)
 {
-        const bool open_links_externally = false;
-        const bool open_app_slurls = true;
-        LLFloaterHtml::getInstance()->show(
-                "http://secondlife.com/app/search/slurls.html",
-                "Web Browser Test", 
-                open_links_externally, 
-                open_app_slurls);
+        LLWeb::loadURL("http://secondlife.com/app/search/slurls.html");
 }
 
 void handle_buy_currency_test(void*)