128 files changed, 9405 insertions, 1952 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1691095..15561d0 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -21,8 +21,8 @@ include(LLImage)
 include(LLImageJ2COJ)
 include(LLInventory)
 include(LLMath)
-include(LLMedia)
 include(LLMessage)
+include(LLPlugin)
 include(LLPrimitive)
 include(LLRender)
 include(LLUI)
@@ -31,7 +31,6 @@ include(LLWindow)
 include(LLXML)
 include(LScript)
 include(Linking)
-include(Mozlib)
 include(NDOF)
 include(GooglePerfTools)
 include(TemplateCheck)
@@ -55,8 +54,8 @@ include_directories(
     ${LLIMAGE_INCLUDE_DIRS}
     ${LLINVENTORY_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
-    ${LLMEDIA_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLPLUGIN_INCLUDE_DIRS}
     ${LLPRIMITIVE_INCLUDE_DIRS}
     ${LLRENDER_INCLUDE_DIRS}
     ${LLUI_INCLUDE_DIRS}
@@ -65,7 +64,6 @@ include_directories(
     ${LLXML_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
-    ${GSTREAMER_INCLUDE_DIRS}
     )
 
 set(viewer_SOURCE_FILES
@@ -185,9 +183,8 @@ set(viewer_SOURCE_FILES
     llfloatergroups.cpp
     llfloaterhandler.cpp
     llfloaterhardwaresettings.cpp
-    llfloaterhtml.cpp
     llfloaterhtmlcurrency.cpp
-    llfloaterhtmlhelp.cpp
+    llfloatermediabrowser.cpp
     llfloaterhtmlsimple.cpp
     llfloaterhud.cpp
     llfloaterimagepreview.cpp
@@ -312,10 +309,12 @@ set(viewer_SOURCE_FILES
     llpanelinput.cpp
     llpanelinventory.cpp
     llpanelland.cpp
+    llpanellandaudio.cpp
     llpanellandmedia.cpp
     llpanellandobjects.cpp
     llpanellandoptions.cpp
     llpanellogin.cpp
+    llpanelmediahud.cpp
     llpanelmsgs.cpp
     llpanelnetwork.cpp
     llpanelobject.cpp
@@ -421,6 +420,8 @@ set(viewer_SOURCE_FILES
     llviewerkeyboard.cpp
     llviewerlayer.cpp
     llviewermedia.cpp
+    llviewermediafocus.cpp
+    llviewermedia_streamingaudio.cpp
     llviewermenu.cpp
     llviewermenufile.cpp
     llviewermessage.cpp
@@ -467,7 +468,7 @@ set(viewer_SOURCE_FILES
     llwearable.cpp
     llwearablelist.cpp
     llweb.cpp
-    llwebbrowserctrl.cpp
+    llmediactrl.cpp
     llwindlightremotectrl.cpp
     llwind.cpp
     llwlanimator.cpp
@@ -630,9 +631,8 @@ set(viewer_HEADER_FILES
     llfloatergroups.h
     llfloaterhandler.h
     llfloaterhardwaresettings.h
-    llfloaterhtml.h
     llfloaterhtmlcurrency.h
-    llfloaterhtmlhelp.h
+    llfloatermediabrowser.h
     llfloaterhtmlsimple.h
     llfloaterhud.h
     llfloaterimagepreview.h
@@ -756,11 +756,13 @@ set(viewer_HEADER_FILES
     llpanelinput.h
     llpanelinventory.h
     llpanelland.h
+    llpanellandaudio.h
     llpanellandmedia.h
     llpanellandobjects.h
     llpanellandoptions.h
     llpanelLCD.h
     llpanellogin.h
+    llpanelmediahud.h
     llpanelmsgs.h
     llpanelnetwork.h
     llpanelobject.h
@@ -867,6 +869,8 @@ set(viewer_HEADER_FILES
     llviewerkeyboard.h
     llviewerlayer.h
     llviewermedia.h
+    llviewermediaobserver.h
+    llviewermediafocus.h
     llviewermenu.h
     llviewermenufile.h
     llviewermessage.h
@@ -915,7 +919,7 @@ set(viewer_HEADER_FILES
     llwearable.h
     llwearablelist.h
     llweb.h
-    llwebbrowserctrl.h
+    llmediactrl.h
     llwind.h
     llwindebug.h
     llwindlightremotectrl.h
@@ -1118,6 +1122,7 @@ if (WINDOWS)
     if (INTEL_MEMOPS_LIBRARY)
       list(APPEND viewer_LIBRARIES ${INTEL_MEMOPS_LIBRARY})
     endif (INTEL_MEMOPS_LIBRARY)
+    use_prebuilt_binary(dbghelp)
 endif (WINDOWS)
 
 # Add the xui files. This is handy for searching for xui elements
@@ -1134,6 +1139,8 @@ set(viewer_XUI_FILES
 
 
     )
+list(APPEND viewer_XUI_FILES ${viewer_XUI_FILE_GLOB_LIST})
+list(SORT viewer_XUI_FILES)
 
 list(APPEND viewer_XUI_FILES ${viewer_XUI_FILE_GLOB_LIST})
 list(SORT viewer_XUI_FILES)
@@ -1169,6 +1176,7 @@ set(viewer_APPSETTINGS_FILES
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
     )
 
+
 source_group("App Settings" FILES ${viewer_APPSETTINGS_FILES})
 
 set_source_files_properties(${viewer_APPSETTINGS_FILES}
@@ -1326,6 +1334,9 @@ if (WINDOWS)
               --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
         DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
+
+    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit)
+
     if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
       add_dependencies(package windows-updater windows-crash-logger)
@@ -1338,8 +1349,8 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLIMAGE_LIBRARIES}
     ${LLIMAGEJ2COJ_LIBRARIES}
     ${LLINVENTORY_LIBRARIES}
-    ${LLMEDIA_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
+    ${LLPLUGIN_LIBRARIES}
     ${LLPRIMITIVE_LIBRARIES}
     ${LLRENDER_LIBRARIES}
     ${FREETYPE_LIBRARIES}
@@ -1361,7 +1372,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${OPENGL_LIBRARIES}
     ${FMODWRAPPER_LIBRARY}
     ${OPENGL_LIBRARIES}
-    ${MOZLIB_LIBRARIES}
     ${JSONCPP_LIBRARIES}
     ${SDL_LIBRARY}
     ${SMARTHEAP_LIBRARY}
@@ -1443,6 +1453,8 @@ if (DARWIN)
     DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
 
+  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit)
+
   if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME}) 
       add_dependencies(package mac-updater mac-crash-logger)
@@ -1461,6 +1473,8 @@ if (DARWIN)
           --build=${CMAKE_CURRENT_BINARY_DIR}
           --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
           --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+
+  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit)
         DEPENDS
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
@@ -1492,3 +1506,65 @@ if (INSTALL)
 endif (INSTALL)
 
 ADD_VIEWER_BUILD_TEST(llagentaccess viewer)
+
+# Don't do these for DARWIN or LINUX here -- they're taken care of by viewer_manifest.py
+if (WINDOWS)
+  get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
+  add_custom_command(
+      TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+      COMMAND ${CMAKE_COMMAND}
+      ARGS
+        -E
+        copy_if_different
+        ${BUILT_SLPLUGIN}
+        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+      COMMENT "Copying SLPlugin executable to the runtime folder."
+      )
+
+  get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
+    add_custom_command(
+        TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_if_different
+          ${BUILT_WEBKIT_PLUGIN}
+          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
+        COMMENT "Copying WebKit Plugin to the runtime folder."
+        )
+
+  get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
+    add_custom_command(
+        TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_if_different
+          ${BUILT_QUICKTIME_PLUGIN}
+          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
+        COMMENT "Copying Quicktime Plugin to the runtime folder."
+        )
+
+  # Copying the mime_types.xml file to app_settings
+  set(mime_types_source "${CMAKE_SOURCE_DIR}/newview/skins/default/xui/en-us")
+  set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings")
+  add_custom_command(
+      TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+      COMMAND ${CMAKE_COMMAND}
+      ARGS 
+         -E
+         copy_if_different
+         ${mime_types_source}/mime_types_windows.xml 
+         ${mime_types_dest}/mime_types.xml
+      COMMENT "Copying mime_types_windows.xml to mime_types.xml."
+      )
+
+endif (WINDOWS)
+
+if (DARWIN)
+# Don't do this here -- it's taken care of by viewer_manifest.py
+#  add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
+#    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
+#  )
+endif (DARWIN)
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 0a27aa2..4d80845 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7624,7 +7624,40 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>MemoryLogFrequency</key>
+  <key>MediaControlFadeTime</key>
+  <map>
+    <key>Comment</key>
+    <string>Amount of time (in seconds) that the media control fades</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1.5</real>
+  </map>
+  <key>MediaControlTimeout</key>
+  <map>
+    <key>Comment</key>
+    <string>Amount of time (in seconds) for media controls to fade with no mouse activity</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>3.0</real>
+  </map>
+  <key>MediaOnAPrimUI</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether or not to show the "link sharing" UI</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>MemoryLogFrequency</key>
         <map>
         <key>Comment</key>
             <string>Seconds between display of Memory in log (0 for never)</string>
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 59804c0..d90bcd8 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -16,7 +16,7 @@
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS “AS IS”
+ * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS �AS IS�
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
@@ -69,7 +69,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerparcelmedia.h"
 #include "llparcel.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llviewerparcelmediaautoplay.h"
 #include "lloverlaybar.h"
 #include "lggautocorrectfloater.h"
diff --git a/linden/indra/newview/floatervoicelicense.cpp b/linden/indra/newview/floatervoicelicense.cpp
index 4004290..74d16c3 100644
--- a/linden/indra/newview/floatervoicelicense.cpp
+++ b/linden/indra/newview/floatervoicelicense.cpp
@@ -27,7 +27,7 @@
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
 */
-
+/*
 #include "llviewerprecompiledheaders.h"
 
 #include "floatervoicelicense.h"
@@ -234,4 +234,4 @@ void FloaterVoiceLicense::onNavigateComplete( const EventType& eventIn )
                 LLCheckBoxCtrl * license_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
                 license_agreement->setEnabled( true );
         }
-}
+}*/
diff --git a/linden/indra/newview/floatervoicelicense.h b/linden/indra/newview/floatervoicelicense.h
index 4130d22..9d2012d 100644
--- a/linden/indra/newview/floatervoicelicense.h
+++ b/linden/indra/newview/floatervoicelicense.h
@@ -35,8 +35,8 @@
 
 #include "llmodaldialog.h"
 #include "llassetstorage.h"
-#include "llwebbrowserctrl.h"
-
+//imprudence fixme: removed for media plugins #include "llwebbrowserctrl.h"
+/*
 class LLButton;
 class LLRadioGroup;
 class LLVFS;
@@ -45,7 +45,7 @@ class LLUUID;
 
 class FloaterVoiceLicense : 
         public LLModalDialog,
-        public LLWebBrowserCtrlObserver, 
+        public LLViewerMediaObserver
         public LLFloaterSingleton<FloaterVoiceLicense>
 {
 public:
@@ -67,6 +67,6 @@ public:
 private:
         int                             mWebBrowserWindowId;
         int                             mLoadCompleteCount;
-};
+};*/
 
 #endif // FLOATERVOICELICENSE_H
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 51b6c53..5bcffdb 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -77,6 +77,7 @@
 #include "llfloaterdirectory.h"
 #include "llfloatergroupinfo.h"
 #include "llfloatergroups.h"
+#include "llfloaterland.h"
 #include "llfloatermap.h"
 #include "llfloatermute.h"
 #include "llfloatersnapshot.h"
@@ -113,6 +114,7 @@
 #include "llurldispatcher.h"
 #include "llviewercamera.h"
 #include "llviewerinventory.h"
+#include "llviewermediafocus.h"
 #include "llviewermenu.h"
 #include "llviewernetwork.h"
 #include "llviewerobjectlist.h"
@@ -6061,7 +6063,11 @@ bool LLAgent::teleportCore(bool is_local)
         LLFloaterWorldMap::hide(NULL);
         LLFloaterDirectory::hide(NULL);
 
+        // hide land floater too - it'll be out of date
+        LLFloaterLand::hideInstance();
+        
         LLViewerParcelMgr::getInstance()->deselectLand();
+        LLViewerMediaFocus::getInstance()->setFocusFace(false, NULL, 0, NULL);
 
         // Close all pie menus, deselect land, etc.
         // Don't change the camera until we know teleport succeeded. JC
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index b3f3e59..86c83b9 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -61,8 +61,8 @@
 #include "llviewerwindow.h"
 #include "llviewerdisplay.h"
 #include "llviewermedia.h"
-
-
+#include "llviewerparcelmedia.h"
+#include "llviewermediafocus.h"
 #include "llviewermessage.h"
 #include "llviewerobjectlist.h"
 #include "llworldmap.h"
@@ -103,7 +103,8 @@
 #include "llassetstorage.h"
 #include "llpolymesh.h"
 #include "llcachename.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
+#include "llstreamingaudio.h"
 #include "llviewermenu.h"
 #include "llselectmgr.h"
 #include "lltrans.h"
@@ -1257,6 +1258,14 @@ bool LLAppViewer::cleanup()
 
         if (gAudiop)
         {
+                // shut down the streaming audio sub-subsystem first, in case it relies on not outliving the general audio subsystem.
+
+                LLStreamingAudioInterface *sai = gAudiop->getStreamingAudioImpl();
+                delete sai;
+                gAudiop->setStreamingAudioImpl(NULL);
+
+                // shut down the audio subsystem
+
                 bool want_longname = false;
                 if (gAudiop->getDriverName(want_longname) == "FMOD")
                 {
@@ -1483,7 +1492,9 @@ bool LLAppViewer::cleanup()
         //Note:
         //LLViewerMedia::cleanupClass() has to be put before gImageList.shutdown()
         //because some new image might be generated during cleaning up media. --bao
+        LLViewerMediaFocus::cleanupClass();
         LLViewerMedia::cleanupClass();
+        LLViewerParcelMedia::cleanupClass();
         gImageList.shutdown(); // shutdown again in case a callback added something
         LLUIImageList::getInstance()->cleanUp();
         
@@ -3671,6 +3682,9 @@ void LLAppViewer::idle()
                 gAgent.updateCamera();
         }
 
+        // update media focus
+        LLViewerMediaFocus::getInstance()->update();
+
         // objects and camera should be in sync, do LOD calculations now
         {
                 LLFastTimer t(LLFastTimer::FTM_LOD_UPDATE);
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index bfad899..307f925 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -437,7 +437,7 @@ gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **succ
         llinfos << "Was asked to go to slurl: " << slurl << llendl;
 
         std::string url = slurl;
-        LLWebBrowserCtrl* web = NULL;
+        LLMediaCtrl* web = NULL;
         const bool trusted_browser = false;
         if (LLURLDispatcher::dispatch(url, web, trusted_browser))
         {
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index 3cd0836..3a993eb 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -1,6 +1,6 @@
 /**
  * @file llappviewermacosx.cpp
- * @brief The LLAppViewerWin32 class definitions
+ * @brief The LLAppViewerMacOSX class definitions
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
@@ -476,7 +476,7 @@ OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn)
                         url.replace(0, prefix.length(), "secondlife:///app/");
                 }
                 
-                LLWebBrowserCtrl* web = NULL;
+                LLMediaCtrl* web = NULL;
                 const bool trusted_browser = false;
                 LLURLDispatcher::dispatch(url, web, trusted_browser);
         }
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index aff1fb8..b9ec9a0 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -287,7 +287,8 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
                 LLInventoryView* view = LLInventoryView::getActiveInventory();
                 if(view)
                 {
-                        LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                        LLFocusableElement* focus = gFocusMgr.getKeyboardFocus();
+
                         view->getPanel()->setSelection(content["new_inventory_item"].asUUID(), TAKE_FOCUS_NO);
                         if((LLAssetType::AT_TEXTURE == asset_type || LLAssetType::AT_SOUND == asset_type)
                                 && LLFilePicker::instance().getFileCount() <= FILE_COUNT_DISPLAY_THRESHOLD)
@@ -296,7 +297,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
                         }
                         //LLInventoryView::dumpSelectionInformation((void*)view);
                         // restore keyboard focus
-                        gFocusMgr.setKeyboardFocus(focus_ctrl);
+                        gFocusMgr.setKeyboardFocus(focus);
                 }
         }
         else
diff --git a/linden/indra/newview/llaudiosourcevo.h b/linden/indra/newview/llaudiosourcevo.h
index e7bb283..4b70f8b 100644
--- a/linden/indra/newview/llaudiosourcevo.h
+++ b/linden/indra/newview/llaudiosourcevo.h
@@ -34,7 +34,7 @@
 #ifndef LL_LLAUDIOSOURCEVO_H
 #define LL_LLAUDIOSOURCEVO_H
 
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llviewerobject.h"
 
 class LLViewerObject;
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 0a4ca34..99a2a22 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -955,7 +955,7 @@ public:
 
     // Your code here
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 if (tokens.size() < 2) return false;
                 S32 channel = tokens[0].asInteger();
diff --git a/linden/indra/newview/llcommandhandler.cpp b/linden/indra/newview/llcommandhandler.cpp
index 422c94a..a04182a 100644
--- a/linden/indra/newview/llcommandhandler.cpp
+++ b/linden/indra/newview/llcommandhandler.cpp
@@ -55,7 +55,7 @@ public:
         bool dispatch(const std::string& cmd,
                                   const LLSD& params,
                                   const LLSD& query_map,
-                                  LLWebBrowserCtrl* web,
+                                  LLMediaCtrl* web,
                                   bool trusted_browser);
 
 private:
@@ -84,7 +84,7 @@ void LLCommandHandlerRegistry::add(const char* cmd, bool require_trusted_browser
 bool LLCommandHandlerRegistry::dispatch(const std::string& cmd,
                                                                                 const LLSD& params,
                                                                                 const LLSD& query_map,
-                                                                                LLWebBrowserCtrl* web,
+                                                                                LLMediaCtrl* web,
                                                                                 bool trusted_browser)
 {
         std::map<std::string, LLCommandHandlerInfo>::iterator it = mMap.find(cmd);
@@ -126,7 +126,7 @@ LLCommandHandler::~LLCommandHandler()
 bool LLCommandDispatcher::dispatch(const std::string& cmd,
                                                                    const LLSD& params,
                                                                    const LLSD& query_map,
-                                                                   LLWebBrowserCtrl* web,
+                                                                   LLMediaCtrl* web,
                                                                    bool trusted_browser)
 {
         return LLCommandHandlerRegistry::instance().dispatch(
diff --git a/linden/indra/newview/llcommandhandler.h b/linden/indra/newview/llcommandhandler.h
index ab4c2cc..5cb3ee7 100644
--- a/linden/indra/newview/llcommandhandler.h
+++ b/linden/indra/newview/llcommandhandler.h
@@ -47,7 +47,7 @@ public:
 
     // Your code here
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 if (tokens.size() < 1) return false;
                 LLUUID id( tokens[0] );
@@ -60,7 +60,7 @@ LLFooHandler gFooHandler;
 
 */
 
-class LLWebBrowserCtrl;
+class LLMediaCtrl;
 
 class LLCommandHandler
 {
@@ -68,14 +68,14 @@ public:
         LLCommandHandler(const char* command, bool allow_from_untrusted_browser);
                 // Automatically registers object to get called when 
                 // command is executed.  All commands can be processed
-                // in links from LLWebBrowserCtrl, but some (like teleport)
+                // in links from LLMediaCtrl, but some (like teleport)
                 // should not be allowed from outside the app.
                 
         virtual ~LLCommandHandler();
 
         virtual bool handle(const LLSD& params,
                                                 const LLSD& query_map,
-                                                LLWebBrowserCtrl* web) = 0;
+                                                LLMediaCtrl* web) = 0;
                 // For URL secondlife:///app/foo/bar/baz?cat=1&dog=2
                 // @params - array of "bar", "baz", possibly empty
                 // @query_map - map of "cat" -> 1, "dog" -> 2, possibly empty
@@ -91,7 +91,7 @@ public:
         static bool dispatch(const std::string& cmd,
                                                  const LLSD& params,
                                                  const LLSD& query_map,
-                                                 LLWebBrowserCtrl* web,
+                                                 LLMediaCtrl* web,
                                                  bool trusted_browser);
                 // Execute a command registered via the above mechanism,
                 // passing string parameters.
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index e82aa96..ca8614c 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -397,8 +397,8 @@ void LLFirstUse::voiceLicenseAgreement()
         {
                 gSavedSettings.setWarning("FirstVoiceLicense", FALSE);
 
-                FloaterVoiceLicense::getInstance()->open();
-                FloaterVoiceLicense::getInstance()->center();
+// imprudence fixme             FloaterVoiceLicense::getInstance()->open();
+//                              FloaterVoiceLicense::getInstance()->center();
         }
         else // currently in STATE_LOGIN_VOICE_LICENSE when arriving here
         {
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 1945df4..d2d1250 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -42,7 +42,7 @@
 
 #include "llcurl.h"
 #include "llimagej2c.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
 
 #include "hippoGridManager.h"
 #include "llviewertexteditor.h"
@@ -57,7 +57,6 @@
 #include "lltrans.h"
 #include "llappviewer.h" 
 #include "llglheaders.h"
-#include "llmediamanager.h"
 #include "llwindow.h"
 #include "viewerversion.h"
 
@@ -244,26 +243,10 @@ LLFloaterAbout::LLFloaterAbout()
 
         support.append("\n");
 
-        LLMediaManager *mgr = LLMediaManager::getInstance();
-        if (mgr)
-        {
-                LLMediaBase *gstreamer = mgr->createSourceFromMimeType("http", "audio/mpeg");
-                if (gstreamer)
-                {
-                        support.append("GStreamer Version: ");
-                        support.append( gstreamer->getVersion() );
-                        support.append("\n");
-                } 
-
-                LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html");
-                if (media_source)
-                {
-                        support.append("LLMozLib Version: ");
-                        support.append(media_source->getVersion());
-                        support.append("\n");
-                        mgr->destroySource(media_source);
-                }
-        }
+        // TODO: Implement media plugin version query
+
+        support.append("Qt Webkit Version: 4.5.2 ");
+        support.append("\n");
 
         if (gPacketsIn > 0)
         {
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index 21f160e..0618875 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -63,7 +63,7 @@ public:
         LLAgentHandler() : LLCommandHandler("agent", true) { }
 
         bool handle(const LLSD& params, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 if (params.size() < 2) return false;
                 LLUUID agent_id;
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 59f4d70..2daa5aa 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -190,6 +190,15 @@ void LLFloaterChat::setMinimized(BOOL minimized)
         updateConsoleVisibility();
 }
 
+// linden library includes
+#include "llaudioengine.h"
+#include "llchat.h"
+#include "llfontgl.h"
+#include "llrect.h"
+#include "llerror.h"
+#include "llstring.h"
+#include "llwindow.h"
+#include "message.h"
 
 void LLFloaterChat::updateConsoleVisibility()
 {
@@ -583,13 +592,54 @@ void LLFloaterChat::addChat(const LLChat& chat,
         if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory"))    
                 addChatHistory(chat,false);
 
-        LLTextParser* highlight = LLTextParser::getInstance();
-        highlight->triggerAlerts(gAgent.getID(), gAgent.getPositionGlobal(), chat.mText, gViewerWindow->getWindow());
+        triggerAlerts(chat.mText);
 
         if(!from_instant_message)
                 addChatHistory(chat);
 }
 
+// Moved from lltextparser.cpp to break llui/llaudio library dependency.
+//static
+void LLFloaterChat::triggerAlerts(const std::string& text)
+{
+        LLTextParser* parser = LLTextParser::getInstance();
+//    bool spoken=FALSE;
+        for (S32 i=0;i<parser->mHighlights.size();i++)
+        {
+                LLSD& highlight = parser->mHighlights[i];
+                if (parser->findPattern(text,highlight) >= 0 )
+                {
+                        if(gAudiop)
+                        {
+                                if ((std::string)highlight["sound_lluuid"] != LLUUID::null.asString())
+                                {
+                                        gAudiop->triggerSound(highlight["sound_lluuid"].asUUID(), 
+                                                gAgent.getID(),
+                                                1.f,
+                                                LLAudioEngine::AUDIO_TYPE_UI,
+                                                gAgent.getPositionGlobal() );
+                                }
+/*                              
+                                if (!spoken) 
+                                {
+                                        LLTextToSpeech* text_to_speech = NULL;
+                                        text_to_speech = LLTextToSpeech::getInstance();
+                                        spoken = text_to_speech->speak((LLString)highlight["voice"],text); 
+                                }
+ */
+                        }
+                        if (highlight["flash"])
+                        {
+                                LLWindow* viewer_window = gViewerWindow->getWindow();
+                                if (viewer_window && viewer_window->getMinimized())
+                                {
+                                        viewer_window->flashIcon(5.f);
+                                }
+                        }
+                }
+        }
+}
+
 LLColor4 get_text_color(const LLChat& chat)
 {
         LLColor4 text_color;
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h
index 5a26567..f8683b9 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -78,6 +78,8 @@ public:
         // Add chat to history alone.
         static void addChatHistory(const LLChat& chat, bool log_to_file = true);
         
+        static void triggerAlerts(const std::string& text);
+
         static void onClickMute(void *data);
         static void onClickToggleShowMute(LLUICtrl* caller, void *data);
         static void onClickToggleTranslateChat(LLUICtrl* caller, void *data);
diff --git a/linden/indra/newview/llfloaterclassified.cpp b/linden/indra/newview/llfloaterclassified.cpp
index d426e04..0760303 100644
--- a/linden/indra/newview/llfloaterclassified.cpp
+++ b/linden/indra/newview/llfloaterclassified.cpp
@@ -57,7 +57,7 @@ public:
         // requires trusted browser to trigger
         LLClassifiedHandler() : LLCommandHandler("classified", true) { }
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 if (tokens.size() < 2)
                 {
diff --git a/linden/indra/newview/llfloaterevent.cpp b/linden/indra/newview/llfloaterevent.cpp
index 485c13c..0ec2a76 100644
--- a/linden/indra/newview/llfloaterevent.cpp
+++ b/linden/indra/newview/llfloaterevent.cpp
@@ -58,7 +58,7 @@ public:
         // requires trusted browser to trigger
         LLEventHandler() : LLCommandHandler("event", true) { }
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 if (tokens.size() < 2)
                 {
diff --git a/linden/indra/newview/llfloatergroupinfo.cpp b/linden/indra/newview/llfloatergroupinfo.cpp
index 6fbd5e1..3ae7d5a 100644
--- a/linden/indra/newview/llfloatergroupinfo.cpp
+++ b/linden/indra/newview/llfloatergroupinfo.cpp
@@ -60,7 +60,7 @@ public:
         // requires trusted browser to trigger
         LLGroupHandler() : LLCommandHandler("group", true) { }
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 if (tokens.size() < 1)
                 {
diff --git a/linden/indra/newview/llfloaterhandler.cpp b/linden/indra/newview/llfloaterhandler.cpp
index f4c7e43..7cf7156 100644
--- a/linden/indra/newview/llfloaterhandler.cpp
+++ b/linden/indra/newview/llfloaterhandler.cpp
@@ -31,7 +31,7 @@
 #include "llfloaterhandler.h"
 
 #include "llfloater.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 
 // register with dispatch via global object
 LLFloaterHandler gFloaterHandler;
@@ -54,7 +54,7 @@ LLFloater* get_parent_floater(LLView* view)
 }
 
 
-bool LLFloaterHandler::handle(const LLSD &params, const LLSD &query_map, LLWebBrowserCtrl *web)
+bool LLFloaterHandler::handle(const LLSD &params, const LLSD &query_map, LLMediaCtrl *web)
 {
         if (params.size() < 2) return false;
         LLFloater* floater = NULL;
diff --git a/linden/indra/newview/llfloaterhandler.h b/linden/indra/newview/llfloaterhandler.h
index b08f1f3..31ea80c 100644
--- a/linden/indra/newview/llfloaterhandler.h
+++ b/linden/indra/newview/llfloaterhandler.h
@@ -39,7 +39,7 @@ class LLFloaterHandler
 {
 public:
         LLFloaterHandler() : LLCommandHandler("floater", true) { }
-        bool handle(const LLSD& params, const LLSD& query_map, LLWebBrowserCtrl* web);
+        bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web);
 };
 
 #endif
diff --git a/linden/indra/newview/llfloaterhtmlsimple.cpp b/linden/indra/newview/llfloaterhtmlsimple.cpp
index 7dfc4f6..8091c1e 100644
--- a/linden/indra/newview/llfloaterhtmlsimple.cpp
+++ b/linden/indra/newview/llfloaterhtmlsimple.cpp
@@ -35,7 +35,7 @@
 #include "llfloaterhtmlsimple.h"
 
 #include "lluictrlfactory.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 
 
 LLFloaterHtmlSimple::LLFloaterHtmlSimple(const LLSD &initial_url)
@@ -56,12 +56,12 @@ LLFloaterHtmlSimple::~LLFloaterHtmlSimple()
 
 void LLFloaterHtmlSimple::navigateTo(const std::string &url)
 {
-        LLWebBrowserCtrl* web = getChild<LLWebBrowserCtrl>("browser");
+        LLMediaCtrl* web = getChild<LLMediaCtrl>("browser");
         web->navigateTo(url);
 }
 
 void LLFloaterHtmlSimple::setTrusted(bool trusted)
 {
-        LLWebBrowserCtrl* web = getChild<LLWebBrowserCtrl>("browser");
+        LLMediaCtrl* web = getChild<LLMediaCtrl>("browser");
         web->setTrusted(trusted);
 }
diff --git a/linden/indra/newview/llfloaterhud.cpp b/linden/indra/newview/llfloaterhud.cpp
index 9810bf1..6324b56 100644
--- a/linden/indra/newview/llfloaterhud.cpp
+++ b/linden/indra/newview/llfloaterhud.cpp
@@ -36,7 +36,7 @@
 
 // Viewer libs
 #include "llviewercontrol.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 #include "llalertdialog.h"
 
 // Linden libs
@@ -74,7 +74,7 @@ LLFloaterHUD::LLFloaterHUD()
         reshape(saved_position_rect.getWidth(), saved_position_rect.getHeight(), FALSE);
         setRect(saved_position_rect);
         
-        mWebBrowser = getChild<LLWebBrowserCtrl>("floater_hud_browser" );
+        mWebBrowser = getChild<LLMediaCtrl>("floater_hud_browser" );
         if (mWebBrowser)
         {
                 // Open links in internal browser
diff --git a/linden/indra/newview/llfloaterhud.h b/linden/indra/newview/llfloaterhud.h
index 2d58685..919ffef 100644
--- a/linden/indra/newview/llfloaterhud.h
+++ b/linden/indra/newview/llfloaterhud.h
@@ -35,7 +35,7 @@
 
 #include "llfloater.h"
 
-class LLWebBrowserCtrl;
+class LLMediaCtrl;
 
 class LLFloaterHUD : public LLFloater
 {
@@ -53,7 +53,7 @@ private:
         /*virtual*/ ~LLFloaterHUD();
 
 private:
-        LLWebBrowserCtrl* mWebBrowser; ///< the actual web browser control
+        LLMediaCtrl* mWebBrowser; ///< the actual web browser control
         static LLFloaterHUD* sInstance;
 };
 
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 066b739..39de55f 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -56,6 +56,7 @@
 #include "lllineeditor.h"
 #include "llnamelistctrl.h"
 #include "llnotify.h"
+#include "llpanellandaudio.h"
 #include "llpanellandmedia.h"
 #include "llradiogroup.h"
 #include "llscrolllistctrl.h"
@@ -204,6 +205,7 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
         factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);
         factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this);
         factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this);
+//      factory_map["land_audio_panel"] =       LLCallbackMap(createPanelLandAudio, this);
         factory_map["land_media_panel"] =       LLCallbackMap(createPanelLandMedia, this);
         factory_map["land_access_panel"] =      LLCallbackMap(createPanelLandAccess, this);
 
@@ -239,6 +241,7 @@ void LLFloaterLand::refresh()
         mPanelGeneral->refresh();
         mPanelObjects->refresh();
         mPanelOptions->refresh();
+//      mPanelAudio->refresh();
         mPanelMedia->refresh();
         mPanelAccess->refresh();
 }
@@ -277,6 +280,15 @@ void* LLFloaterLand::createPanelLandOptions(void* data)
         return self->mPanelOptions;
 }
 
+/*
+// static
+void* LLFloaterLand::createPanelLandAudio(void* data)
+{
+        LLFloaterLand* self = (LLFloaterLand*)data;
+        self->mPanelAudio = new LLPanelLandAudio(self->mParcel);
+        return self->mPanelAudio;
+}
+*/
 // static
 void* LLFloaterLand::createPanelLandMedia(void* data)
 {
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index 113b679..4105f44 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -64,6 +64,7 @@ class LLParcelSelection;
 class LLPanelLandGeneral;
 class LLPanelLandObjects;
 class LLPanelLandOptions;
+class LLPanelLandAudio;
 class LLPanelLandMedia;
 class LLPanelLandAccess;
 class LLPanelLandBan;
@@ -102,6 +103,7 @@ protected:
         static void* createPanelLandCovenant(void* data);
         static void* createPanelLandObjects(void* data);
         static void* createPanelLandOptions(void* data);
+        static void* createPanelLandAudio(void* data);
         static void* createPanelLandMedia(void* data);
         static void* createPanelLandAccess(void* data);
         static void* createPanelLandBan(void* data);
@@ -115,6 +117,7 @@ protected:
         LLPanelLandGeneral*             mPanelGeneral;
         LLPanelLandObjects*             mPanelObjects;
         LLPanelLandOptions*             mPanelOptions;
+//      LLPanelLandAudio*               mPanelAudio;
         LLPanelLandMedia*               mPanelMedia;
         LLPanelLandAccess*              mPanelAccess;
         LLPanelLandCovenant*    mPanelCovenant;
diff --git a/linden/indra/newview/llfloatermediabrowser.cpp b/linden/indra/newview/llfloatermediabrowser.cpp
new file mode 100644
index 0000000..def0159
--- /dev/null
+++ b/linden/indra/newview/llfloatermediabrowser.cpp
@@ -0,0 +1,398 @@
+/** 
+ * @file llfloaterhtmlhelp.cpp
+ * @brief HTML Help floater - uses embedded web browser control
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
+ * Copyright (c) 2006-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatermediabrowser.h"
+#include "llfloaterhtml.h"
+
+#include "llparcel.h"
+#include "llpluginclassmedia.h"
+#include "lluictrlfactory.h"
+#include "llmediactrl.h"
+#include "llviewerwindow.h"
+#include "llviewercontrol.h"
+#include "llviewerparcelmgr.h"
+#include "llweb.h"
+#include "llui.h"
+#include "roles_constants.h"
+
+#include "llurlhistory.h"
+#include "llmediactrl.h"
+#include "llviewermedia.h"
+#include "llviewerparcelmedia.h"
+#include "llcombobox.h"
+
+
+// TEMP
+#include "llsdutil.h"
+
+LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_media_browser.xml");
+
+}
+
+void LLFloaterMediaBrowser::draw()
+{
+        childSetEnabled("go", !mAddressCombo->getValue().asString().empty());
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if(parcel)
+        {
+                childSetVisible("parcel_owner_controls", LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA));
+                childSetEnabled("assign", !mAddressCombo->getValue().asString().empty());
+        }
+        bool show_time_controls = false;
+        bool media_playing = false;
+        if(mBrowser)
+        {
+                LLPluginClassMedia* media_plugin = mBrowser->getMediaPlugin();
+                if(media_plugin)
+                {
+                        show_time_controls = media_plugin->pluginSupportsMediaTime();
+                        media_playing = media_plugin->getStatus() == LLPluginClassMediaOwner::MEDIA_PLAYING;
+                }
+        }
+        childSetVisible("rewind", show_time_controls);
+        childSetVisible("play", show_time_controls && ! media_playing);
+        childSetVisible("pause", show_time_controls && media_playing);
+        childSetVisible("stop", show_time_controls);
+        childSetVisible("seek", show_time_controls);
+
+        childSetEnabled("play", ! media_playing);
+        childSetEnabled("stop", media_playing);
+
+        childSetEnabled("back", mBrowser->canNavigateBack());
+        childSetEnabled("forward", mBrowser->canNavigateForward());
+
+        LLFloater::draw();
+}
+
+BOOL LLFloaterMediaBrowser::postBuild()
+{
+        mBrowser = getChild<LLMediaCtrl>("browser");
+        mBrowser->addObserver(this);
+
+        mAddressCombo = getChild<LLComboBox>("address");
+        mAddressCombo->setCommitCallback(onEnterAddress);
+        mAddressCombo->setCallbackUserData(this);
+
+        childSetAction("back", onClickBack, this);
+        childSetAction("forward", onClickForward, this);
+        childSetAction("reload", onClickRefresh, this);
+        childSetAction("rewind", onClickRewind, this);
+        childSetAction("play", onClickPlay, this);
+        childSetAction("stop", onClickStop, this);
+        childSetAction("pause", onClickPlay, this);
+        childSetAction("seek", onClickSeek, this);
+        childSetAction("go", onClickGo, this);
+        childSetAction("close", onClickClose, this);
+        childSetAction("open_browser", onClickOpenWebBrowser, this);
+        childSetAction("assign", onClickAssign, this);
+
+        buildURLHistory();
+        return TRUE;
+}
+
+void LLFloaterMediaBrowser::buildURLHistory()
+{
+        LLCtrlListInterface* url_list = childGetListInterface("address");
+        if (url_list)
+        {
+                url_list->operateOnAll(LLCtrlListInterface::OP_DELETE);
+        }
+
+        // Get all of the entries in the "browser" collection
+        LLSD browser_history = LLURLHistory::getURLHistory("browser");
+
+        LLSD::array_iterator iter_history =
+                browser_history.beginArray();
+        LLSD::array_iterator end_history =
+                browser_history.endArray();
+        for(; iter_history != end_history; ++iter_history)
+        {
+                std::string url = (*iter_history).asString();
+                if(! url.empty())
+                        url_list->addSimpleElement(url);
+        }
+
+        // initialize URL history in the plugin
+        mBrowser->getMediaPlugin()->initializeUrlHistory(browser_history);
+}
+
+std::string LLFloaterMediaBrowser::getSupportURL()
+{
+        return getString("support_page_url");
+}
+void LLFloaterMediaBrowser::onClose(bool app_quitting)
+{
+        //setVisible(FALSE);
+        destroy();
+}
+
+void LLFloaterMediaBrowser::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
+{
+        if(event == MEDIA_EVENT_LOCATION_CHANGED)
+        {
+                setCurrentURL(self->getLocation());
+        }
+        else if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)
+        {
+                // This is the event these flags are sent with.
+                childSetEnabled("back", self->getHistoryBackAvailable());
+                childSetEnabled("forward", self->getHistoryForwardAvailable());
+        }
+}
+void LLFloaterMediaBrowser::setCurrentURL(const std::string& url)
+{
+        mCurrentURL = url;
+
+        // redirects will navigate momentarily to about:blank, don't add to history
+        if (mCurrentURL != "about:blank")
+        {
+                mAddressCombo->remove(mCurrentURL);
+                mAddressCombo->add(mCurrentURL, ADD_SORTED);
+                mAddressCombo->selectByValue(mCurrentURL);
+
+                // Serialize url history
+                LLURLHistory::removeURL("browser", mCurrentURL);
+                LLURLHistory::addURL("browser", mCurrentURL);
+        }
+        childSetEnabled("back", mBrowser->canNavigateBack());
+        childSetEnabled("forward", mBrowser->canNavigateForward());
+        childSetEnabled("reload", TRUE);
+}
+
+LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url)
+{
+        LLFloaterMediaBrowser* floaterp = LLUISingleton<LLFloaterMediaBrowser, VisibilityPolicy<LLFloater> >::showInstance(media_url);
+
+        floaterp->openMedia(media_url.asString());
+        return floaterp;
+}
+
+//static 
+void LLFloaterMediaBrowser::onEnterAddress(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+        self->mBrowser->navigateTo(self->mAddressCombo->getValue().asString());
+}
+
+//static 
+void LLFloaterMediaBrowser::onClickRefresh(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        self->mAddressCombo->remove(0);
+        self->mBrowser->navigateTo(self->mCurrentURL);
+}
+
+//static 
+void LLFloaterMediaBrowser::onClickForward(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        self->mBrowser->navigateForward();
+}
+
+//static 
+void LLFloaterMediaBrowser::onClickBack(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        self->mBrowser->navigateBack();
+}
+
+//static 
+void LLFloaterMediaBrowser::onClickGo(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        self->mBrowser->navigateTo(self->mAddressCombo->getValue().asString());
+}
+
+//static 
+void LLFloaterMediaBrowser::onClickClose(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        self->close();
+}
+
+//static 
+void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        std::string url = self->mCurrentURL.empty() ? 
+                self->mBrowser->getHomePageUrl() :
+                self->mCurrentURL;
+        LLWeb::loadURLExternal(url);
+}
+
+void LLFloaterMediaBrowser::onClickAssign(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if (!parcel)
+        {
+                return;
+        }
+        std::string media_url = self->mAddressCombo->getValue().asString();
+        LLStringUtil::trim(media_url);
+
+        if(parcel->getMediaType() != "text/html")
+        {
+                parcel->setMediaURL(media_url);
+                parcel->setMediaCurrentURL(media_url);
+                parcel->setMediaType(std::string("text/html"));
+                LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel, true );
+                LLViewerParcelMedia::sendMediaNavigateMessage(media_url);
+                LLViewerParcelMedia::stop();
+                // LLViewerParcelMedia::update( parcel );
+        }
+        LLViewerParcelMedia::sendMediaNavigateMessage(media_url);
+}
+//static 
+void LLFloaterMediaBrowser::onClickRewind(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        if(self->mBrowser->getMediaPlugin())
+                self->mBrowser->getMediaPlugin()->start(-2.0f);
+}
+//static 
+void LLFloaterMediaBrowser::onClickPlay(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        LLPluginClassMedia* plugin = self->mBrowser->getMediaPlugin();
+        if(plugin)
+        {
+                if(plugin->getStatus() == LLPluginClassMediaOwner::MEDIA_PLAYING)
+                {
+                        plugin->pause();
+                }
+                else
+                {
+                        plugin->start();
+                }
+        }
+}
+//static 
+void LLFloaterMediaBrowser::onClickStop(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        if(self->mBrowser->getMediaPlugin())
+                self->mBrowser->getMediaPlugin()->stop();
+}
+//static 
+void LLFloaterMediaBrowser::onClickSeek(void* user_data)
+{
+        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+
+        if(self->mBrowser->getMediaPlugin())
+                self->mBrowser->getMediaPlugin()->start(2.0f);
+}
+void LLFloaterMediaBrowser::openMedia(const std::string& media_url)
+{
+        mBrowser->setHomePageUrl(media_url);
+        mBrowser->navigateTo(media_url);
+        setCurrentURL(media_url);
+}
+////////////////////////////////////////////////////////////////////////////////
+//
+
+LLViewerHtmlHelp gViewerHtmlHelp;
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLViewerHtmlHelp::LLViewerHtmlHelp()
+{
+
+        LLUI::setHtmlHelp(this);
+}
+
+LLViewerHtmlHelp::~LLViewerHtmlHelp()
+{
+
+        LLUI::setHtmlHelp(NULL);
+}
+
+void LLViewerHtmlHelp::show()
+{
+        show("");
+}
+
+void LLViewerHtmlHelp::show(std::string url)
+{
+        LLFloaterMediaBrowser* floater_html = LLFloaterMediaBrowser::getInstance();
+        floater_html->setVisible(FALSE);
+
+        if (url.empty())
+        {
+                url = floater_html->getSupportURL();
+        }
+
+        if (gSavedSettings.getBOOL("UseExternalBrowser"))
+        {
+                LLSD notificationData;
+                notificationData["url"] = url;                                                                              
+
+                LLNotifications::instance().add("ClickOpenF1Help", notificationData, LLSD(), onClickF1HelpLoadURL);         
+                floater_html->close();
+        }
+        else
+        {
+                // don't wait, just do it
+                floater_html->setVisible(TRUE);
+                floater_html->openMedia(url);
+        }
+}
+// static 
+bool LLViewerHtmlHelp::onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response)
+{
+        LLFloaterMediaBrowser* floater_html = LLFloaterMediaBrowser::getInstance();
+        floater_html->setVisible(FALSE);
+        std::string url = floater_html->getSupportURL();
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if (option == 0)
+        {
+                LLWeb::loadURL(url);
+        }
+        floater_html->close();
+        return false;
+}
+
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloatermediabrowser.h
index 83f15cd..8a78df8 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloatermediabrowser.h
@@ -35,7 +35,7 @@
 
 #include "llhtmlhelp.h"
 #include "llfloater.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 
 class LLViewerHtmlHelp : public LLHtmlHelp
 {
@@ -45,28 +45,38 @@ public:
 
         /*virtual*/ void show();
         /*virtual*/ void show(std::string start_url);
+        void show(std::string start_url, std::string title);
+
+        static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
+
 };
 
 class LLComboBox;
-class LLWebBrowserCtrl;
+class LLMediaCtrl;
 
-class LLFloaterMediaBrowser : public LLFloater, public LLFloaterSingleton<LLFloaterMediaBrowser>, public LLWebBrowserCtrlObserver
+class LLFloaterMediaBrowser : 
+        public LLFloater, 
+        public LLUISingleton<LLFloaterMediaBrowser, 
+        VisibilityPolicy<LLFloater> >, 
+        public LLViewerMediaObserver
 {
 public:
         LLFloaterMediaBrowser(const LLSD& media_data);
 
         /*virtual*/ BOOL postBuild();
         /*virtual*/ void onClose(bool app_quitting);
-        /*virtual*/ void onLocationChange( const EventType& eventIn );
-
         /*virtual*/ void draw();
 
+        // inherited from LLViewerMediaObserver
+        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+
         void openMedia(const std::string& media_url);
         void buildURLHistory();
+        std::string getSupportURL();
+        void setCurrentURL(const std::string& url);
 
-        static void     helpF1();
 
-private:
+        static LLFloaterMediaBrowser* showInstance(const LLSD& id);
         static void onEnterAddress(LLUICtrl* ctrl, void* user_data);
         static void onClickRefresh(void* user_data);
         static void onClickBack(void* user_data);
@@ -75,11 +85,13 @@ private:
         static void onClickClose(void* user_data);
         static void onClickOpenWebBrowser(void* user_data);
         static void onClickAssign(void* user_data);
-        static void onClickHome(void* user_data);
-        static void onClickSetHome(void* user_data);
-        static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
+        static void onClickRewind(void* user_data);
+        static void onClickPlay(void* user_data);
+        static void onClickStop(void* user_data);
+        static void onClickSeek(void* user_data);
 
-        LLWebBrowserCtrl* mBrowser;
+private:
+        LLMediaCtrl* mBrowser;
         LLComboBox* mAddressCombo;
         std::string mCurrentURL;
 };
diff --git a/linden/indra/newview/llfloaterobjectiminfo.cpp b/linden/indra/newview/llfloaterobjectiminfo.cpp
index fa7964c..f933a85 100644
--- a/linden/indra/newview/llfloaterobjectiminfo.cpp
+++ b/linden/indra/newview/llfloaterobjectiminfo.cpp
@@ -137,7 +137,7 @@ void LLFloaterObjectIMInfo::onClickMap(void* data)
 
         std::ostringstream link;
         link << "secondlife://" << self->mSlurl;
-        class LLWebBrowserCtrl* web = NULL;
+        class LLMediaCtrl* web = NULL;
         LLURLDispatcher::dispatch(link.str(), web, true);
 }
 
@@ -213,14 +213,14 @@ public:
         LLObjectIMInfoHandler() : LLCommandHandler("objectim", true) { }
 
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web);
+                                LLMediaCtrl* web);
 };
 
 // Creating the object registers with the dispatcher.
 LLObjectIMInfoHandler gObjectIMHandler;
 
 // ex. secondlife:///app/objectim/9426adfc-9c17-8765-5f09-fdf19957d003?owner=a112d245-9095-4e9c-ace4-ffa31717f934&groupowned=true&slurl=ahern/123/123/123&name=Object
-bool LLObjectIMInfoHandler::handle(const LLSD &tokens, const LLSD &query_map, LLWebBrowserCtrl* web)
+bool LLObjectIMInfoHandler::handle(const LLSD &tokens, const LLSD &query_map, LLMediaCtrl* web)
 {
         LLUUID task_id = tokens[0].asUUID();
         std::string name = query_map["name"].asString();
diff --git a/linden/indra/newview/llfloaterparcel.cpp b/linden/indra/newview/llfloaterparcel.cpp
index 4213150..a61f3b9 100644
--- a/linden/indra/newview/llfloaterparcel.cpp
+++ b/linden/indra/newview/llfloaterparcel.cpp
@@ -55,7 +55,7 @@ public:
         // requires trusted browser to trigger
         LLParcelHandler() : LLCommandHandler("parcel", true) { }
         bool handle(const LLSD& params, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 if (params.size() < 2)
                 {
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 09336cb..a94f7cf 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -94,7 +94,7 @@ public:
         // requires trusted browser
         LLPreferencesHandler() : LLCommandHandler("preferences", true) { }
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 LLFloaterPreference::show(NULL);
                 return true;
@@ -445,7 +445,7 @@ void LLFloaterPreference::onBtnOK( void* userdata )
         // commit any outstanding text entry
         if (fp->hasFocus())
         {
-                LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+                LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
                 if (cur_focus->acceptsTextInput())
                 {
                         cur_focus->onCommit();
@@ -479,7 +479,7 @@ void LLFloaterPreference::onBtnApply( void* userdata )
         LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
         if (fp->hasFocus())
         {
-                LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+                LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
                 if (cur_focus->acceptsTextInput())
                 {
                         cur_focus->onCommit();
@@ -505,7 +505,7 @@ void LLFloaterPreference::onBtnCancel( void* userdata )
         LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
         if (fp->hasFocus())
         {
-                LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+                LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
                 if (cur_focus->acceptsTextInput())
                 {
                         cur_focus->onCommit();
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 6a392e0..2dedc79 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -161,12 +161,10 @@ BOOL LLFloaterTOS::postBuild()
         LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
         editor->setVisible( FALSE );
 
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
+        LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
         if ( web_browser )
         {
-                // start to observe it so we see navigate complete events
-                web_browser->addObserver( this );
-
+                web_browser->addObserver(this);
                 gResponsePtr = LLIamHere::build( this );
                 LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
         }
@@ -179,7 +177,7 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
         // only do this for TOS pages
         if ( mType == TOS_TOS )
         {
-                LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
+                LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
                 // if the contents of the site was retrieved
                 if ( alive )
                 {
@@ -201,12 +199,6 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
 
 LLFloaterTOS::~LLFloaterTOS()
 {
-        // stop obsaerving events
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
-        if ( web_browser )
-        {
-                web_browser->remObserver( this );               
-        };
 
         // tell the responder we're not here anymore
         if ( gResponsePtr )
@@ -269,14 +261,17 @@ void LLFloaterTOS::onCancel( void* userdata )
 }
 
 //virtual 
-void LLFloaterTOS::onNavigateComplete( const EventType& eventIn )
+void LLFloaterTOS::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event)
 {
-        // skip past the loading screen navigate complete
-        if ( ++mLoadCompleteCount == 2 )
+        if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)
         {
-                llinfos << "NAVIGATE COMPLETE" << llendl;
-                // enable Agree to TOS radio button now that page has loaded
-                LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-                tos_agreement->setEnabled( true );
-        };
+                // skip past the loading screen navigate complete
+                if ( ++mLoadCompleteCount == 2 )
+                {
+                        llinfos << "NAVIGATE COMPLETE" << llendl;
+                        // enable Agree to TOS radio button now that page has loaded
+                        LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+                        tos_agreement->setEnabled( true );
+                }
+        }
 }
diff --git a/linden/indra/newview/llfloatertos.h b/linden/indra/newview/llfloatertos.h
index dbec3ff..c5d5878 100644
--- a/linden/indra/newview/llfloatertos.h
+++ b/linden/indra/newview/llfloatertos.h
@@ -35,7 +35,7 @@
 
 #include "llmodaldialog.h"
 #include "llassetstorage.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 
 class LLButton;
 class LLRadioGroup;
@@ -45,7 +45,7 @@ class LLUUID;
 
 class LLFloaterTOS : 
         public LLModalDialog,
-        public LLWebBrowserCtrlObserver
+        public LLViewerMediaObserver
 {
 public:
         virtual ~LLFloaterTOS();
@@ -70,7 +70,8 @@ public:
 
         void                    setSiteIsAlive( bool alive );
 
-        virtual void onNavigateComplete( const EventType& eventIn );
+        // inherited from LLViewerMediaObserver
+        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
 
 private:
         // Asset_id is overwritten with LLUUID::null when agree is clicked.
diff --git a/linden/indra/newview/llfloaterurlentry.cpp b/linden/indra/newview/llfloaterurlentry.cpp
index 9d91aa9..8d483e5 100644
--- a/linden/indra/newview/llfloaterurlentry.cpp
+++ b/linden/indra/newview/llfloaterurlentry.cpp
@@ -227,7 +227,7 @@ void LLFloaterURLEntry::onBtnOK( void* userdata )
         }
 
         // Discover the MIME type only for "http" scheme.
-        if(scheme == "http")
+        if(scheme == "http" || scheme == "https")
         {
                 LLHTTPClient::getHeaderOnly( media_url,
                         new LLMediaTypeResponder(self->getHandle()));
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 6367380..109eece 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -154,12 +154,13 @@ void LLHoverView::updateHover(LLTool* current_tool)
 
 void LLHoverView::pickCallback(const LLPickInfo& pick_info)
 {
+        gHoverView->mLastPickInfo = pick_info;
         LLViewerObject* hit_obj = pick_info.getObject();
 
         if (hit_obj)
         {
                 gHoverView->setHoverActive(TRUE);
-                LLSelectMgr::getInstance()->setHoverObject(hit_obj);
+                LLSelectMgr::getInstance()->setHoverObject(hit_obj, pick_info.mObjectFace);
                 gHoverView->mLastHoverObject = hit_obj;
                 gHoverView->mHoverOffset = pick_info.mObjectOffset;
         }
diff --git a/linden/indra/newview/llhoverview.h b/linden/indra/newview/llhoverview.h
index 0891118..d0bb28d 100644
--- a/linden/indra/newview/llhoverview.h
+++ b/linden/indra/newview/llhoverview.h
@@ -42,6 +42,7 @@
 #include "v3dmath.h"
 
 #include "lldarray.h"
+#include "llviewerwindow.h"
 #include "llviewerobject.h"
 
 class LLTool;
@@ -79,6 +80,7 @@ public:
         BOOL isHoveringLand() const;
 
         LLViewerObject* getLastHoverObject() const;
+        LLPickInfo getPickInfo() { return mLastPickInfo; }
 
         static void pickCallback(const LLPickInfo& info);
 
@@ -103,6 +105,7 @@ protected:
 
         // If not null and not dead, we're over an object.
         LLPointer<LLViewerObject>       mLastHoverObject;
+        LLPickInfo                                      mLastPickInfo;
 
         // If not LLVector3d::ZERO, we're over land.
         LLVector3d                                      mHoverLandGlobal;
diff --git a/linden/indra/newview/llhudview.cpp b/linden/indra/newview/llhudview.cpp
index 198514c..afcdd73 100644
--- a/linden/indra/newview/llhudview.cpp
+++ b/linden/indra/newview/llhudview.cpp
@@ -48,14 +48,19 @@
 #include "lltracker.h"
 #include "llviewercamera.h"
 #include "llui.h"
+#include "lluictrlfactory.h"
 
 LLHUDView *gHUDView = NULL;
 
 const S32 HUD_ARROW_SIZE = 32;
 
-LLHUDView::LLHUDView()
-:       LLPanel()
-{ }
+
+
+LLHUDView::LLHUDView(const LLRect& r)
+{
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_hud.xml");
+        userSetShape(r);
+}
 
 LLHUDView::~LLHUDView()
 { }
@@ -64,6 +69,7 @@ LLHUDView::~LLHUDView()
 void LLHUDView::draw()
 {
         LLTracker::drawHUDArrow();
+        LLView::draw();
 }
 
 
@@ -89,4 +95,3 @@ BOOL LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask)
         }
         return LLView::handleMouseDown(x, y, mask);
 }
-
diff --git a/linden/indra/newview/llhudview.h b/linden/indra/newview/llhudview.h
index 7859e7f..05ff9c8 100644
--- a/linden/indra/newview/llhudview.h
+++ b/linden/indra/newview/llhudview.h
@@ -42,7 +42,7 @@ class LLHUDView
 : public LLPanel
 {
 public:
-        LLHUDView();
+        LLHUDView(const LLRect& rect);
         virtual ~LLHUDView();
 
         virtual void draw();
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 808a2c9..cc7a35d 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -2198,8 +2198,8 @@ void LLFloaterIMPanel::sendMsg()
 
                 LLViewerStats::getInstance()->incStat(LLViewerStats::ST_IM_COUNT);
 
+                mInputEditor->setText(LLStringUtil::null);
         }
-        mInputEditor->setText(LLStringUtil::null);
 
         // Don't need to actually send the typing stop message, the other
         // client will infer it from receiving the message.
diff --git a/linden/indra/newview/llloginhandler.cpp b/linden/indra/newview/llloginhandler.cpp
index 6366398..30b05ef 100644
--- a/linden/indra/newview/llloginhandler.cpp
+++ b/linden/indra/newview/llloginhandler.cpp
@@ -111,7 +111,7 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 
 bool LLLoginHandler::handle(const LLSD& tokens,
                                                         const LLSD& query_map,
-                                                        LLWebBrowserCtrl* web)
+                                                        LLMediaCtrl* web)
 {       
         parse(query_map);
         
diff --git a/linden/indra/newview/llloginhandler.h b/linden/indra/newview/llloginhandler.h
index c76d7e8..0844b80 100644
--- a/linden/indra/newview/llloginhandler.h
+++ b/linden/indra/newview/llloginhandler.h
@@ -40,7 +40,7 @@ class LLLoginHandler : public LLCommandHandler
  public:
         // allow from external browsers
         LLLoginHandler() : LLCommandHandler("login", false) { }
-        /*virtual*/ bool handle(const LLSD& tokens, const LLSD& query_map, LLWebBrowserCtrl* web);
+        /*virtual*/ bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web);
 
         // Fill in our internal fields from a SLURL like
         // secondlife:///app/login?first=Bob&last=Dobbs
diff --git a/linden/indra/newview/llmediactrl.cpp b/linden/indra/newview/llmediactrl.cpp
new file mode 100644
index 0000000..1530598
--- /dev/null
+++ b/linden/indra/newview/llmediactrl.cpp
@@ -0,0 +1,1201 @@
+/**
+ * @file LLMediaCtrl.cpp
+ * @brief Web browser UI control
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
+ * Copyright (c) 2006-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+
+#include "llmediactrl.h"
+
+// viewer includes
+#include "llfloaterhtml.h"
+#include "llfloaterworldmap.h"
+#include "lluictrlfactory.h"
+#include "llurldispatcher.h"
+#include "llurlsimstring.h"
+#include "llviewborder.h"
+#include "llviewercontrol.h"
+#include "llviewermedia.h"
+#include "llviewerwindow.h"
+#include "llnotifications.h"
+#include "llweb.h"
+#include "llrender.h"
+#include "llpluginclassmedia.h"
+
+// linden library includes
+#include "llfocusmgr.h"
+
+extern BOOL gRestoreGL;
+
+// Setting the mozilla buffer width to 2048 exactly doesn't work, since it pads its rowbytes a bit, pushing the texture width over 2048.
+// 2000 should give enough headroom for any amount of padding it cares to add.
+const S32 MAX_DIMENSION = 2000;
+const S32 MAX_TEXTURE_DIMENSION = 2048;
+
+static LLRegisterWidget<LLMediaCtrl> r("web_browser");
+
+LLMediaCtrl::LLMediaCtrl( const std::string& name, const LLRect& rect ) :
+        LLUICtrl( name, rect, FALSE, NULL, NULL ),
+        mTextureDepthBytes( 4 ),
+        mWebBrowserImage( 0 ),
+        mBorder(NULL),
+        mFrequentUpdates( true ),
+        mForceUpdate( false ),
+        mOpenLinksInExternalBrowser( false ),
+        mOpenLinksInInternalBrowser( false ),
+        mTrusted( false ),
+        mHomePageUrl( "" ),
+        mIgnoreUIScale( true ),
+        mAlwaysRefresh( false ),
+        mExternalUrl( "" ),
+        mMediaSource( 0 ),
+        mTakeFocusOnClick( true ),
+        mCurrentNavUrl( "about:blank" ),
+        mLastSetCursor( UI_CURSOR_ARROW ),
+        mStretchToFill( true ),
+        mMaintainAspectRatio ( true ),
+        mHideLoading (false)
+{
+        S32 screen_width = mIgnoreUIScale ? 
+                llround((F32)getRect().getWidth() * LLUI::sGLScaleFactor.mV[VX]) : getRect().getWidth();
+        S32 screen_height = mIgnoreUIScale ? 
+                llround((F32)getRect().getHeight() * LLUI::sGLScaleFactor.mV[VY]) : getRect().getHeight();
+
+        mMediaSource = LLViewerMedia::newMediaImpl(mHomePageUrl, LLUUID::null, screen_width, screen_height, false, false, "text/html");
+        if ( !mMediaSource )
+        {
+                llwarns << "media source create failed " << llendl;
+                // return;
+        }
+        else
+        {
+                // create a new texture (based on LLDynamic texture) that will be used to display the output
+                mWebBrowserImage = new LLWebBrowserTexture( screen_width, screen_height, this, mMediaSource );
+        }
+
+        mMediaSource->setVisible( getVisible() );
+
+        mMediaSource->addObserver( this );
+
+        LLRect border_rect( 0, getRect().getHeight() + 2, getRect().getWidth() + 2, 0 );
+        mBorder = new LLViewBorder( std::string("web control border"), border_rect, LLViewBorder::BEVEL_IN );
+        addChild( mBorder );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// note: this is now a singleton and destruction happens via initClass() now
+LLMediaCtrl::~LLMediaCtrl()
+{
+
+        if (mMediaSource)
+        {
+                mMediaSource->remObserver( this );
+                mMediaSource = NULL;
+        }
+
+        if ( mWebBrowserImage )
+        {
+                delete mWebBrowserImage;
+                mWebBrowserImage = NULL;
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::setBorderVisible( BOOL border_visible )
+{
+        if ( mBorder )
+        {
+                mBorder->setVisible( border_visible );
+        };
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::setTakeFocusOnClick( bool take_focus )
+{
+        mTakeFocusOnClick = take_focus;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// set flag that forces the embedded browser to open links in the external system browser
+void LLMediaCtrl::setOpenInExternalBrowser( bool valIn )
+{
+        mOpenLinksInExternalBrowser = valIn;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// set flag that forces the embedded browser to open links in the internal browser floater
+void LLMediaCtrl::setOpenInInternalBrowser( bool valIn )
+{
+        mOpenLinksInInternalBrowser = valIn;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+void LLMediaCtrl::setTrusted( bool valIn )
+{
+        mTrusted = valIn;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLMediaCtrl::handleHover( S32 x, S32 y, MASK mask )
+{
+        convertInputCoords(x, y);
+
+        if (mMediaSource)
+                mMediaSource->mouseMove(x, y);
+
+        gViewerWindow->setCursor(mLastSetCursor);
+
+        return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks )
+{
+        if (mMediaSource && mMediaSource->hasMedia())
+                mMediaSource->getMediaPlugin()->scrollEvent(0, clicks, MASK_NONE);
+
+        return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLMediaCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
+{
+        convertInputCoords(x, y);
+
+        if (mMediaSource)
+        {
+                mMediaSource->mouseUp(x, y);
+
+                // *HACK: LLMediaImplLLMozLib automatically takes focus on mouseup,
+                // in addition to the onFocusReceived() call below.  Undo this. JC
+                if (!mTakeFocusOnClick)
+                {
+                        mMediaSource->focus(false);
+                        gViewerWindow->focusClient();
+                }
+        }
+        
+        gFocusMgr.setMouseCapture( NULL );
+
+        return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLMediaCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
+{
+        convertInputCoords(x, y);
+
+        if (mMediaSource)
+                mMediaSource->mouseDown(x, y);
+        
+        gFocusMgr.setMouseCapture( this );
+
+        if (mTakeFocusOnClick)
+        {
+                setFocus( TRUE );
+        }
+
+        return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLMediaCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
+{
+        convertInputCoords(x, y);
+
+        if (mMediaSource)
+                mMediaSource->mouseLeftDoubleClick( x, y );
+
+        gFocusMgr.setMouseCapture( this );
+
+        if (mTakeFocusOnClick)
+        {
+                setFocus( TRUE );
+        }
+
+        return TRUE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::onFocusReceived()
+{
+        if (mMediaSource)
+        {
+                mMediaSource->focus(true);
+                
+                // Set focus for edit menu items
+                LLEditMenuHandler::gEditMenuHandler = mMediaSource;
+        }
+        
+        LLUICtrl::onFocusReceived();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::onFocusLost()
+{
+        if (mMediaSource)
+        {
+                mMediaSource->focus(false);
+
+                if( LLEditMenuHandler::gEditMenuHandler == mMediaSource )
+                {
+                        // Clear focus for edit menu items
+                        LLEditMenuHandler::gEditMenuHandler = NULL;
+                }
+        }
+
+        gViewerWindow->focusClient();
+
+        LLUICtrl::onFocusLost();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLMediaCtrl::handleKeyHere( KEY key, MASK mask )
+{
+        BOOL result = FALSE;
+        
+        // FIXME: THIS IS SO WRONG.
+        // Menu keys should be handled by the menu system and not passed to UI elements, but this is how LLTextEditor and LLLineEditor do it...
+        
+        if (mMediaSource)
+        {
+                if( MASK_CONTROL & mask )
+                {
+                        if( 'C' == key )
+                        {
+                                mMediaSource->copy();
+                                result = TRUE;
+                        }
+                        else
+                        if( 'V' == key )
+                        {
+                                mMediaSource->paste();
+                                result = TRUE;
+                        }
+                        else
+                        if( 'X' == key )
+                        {
+                                mMediaSource->cut();
+                                result = TRUE;
+                        }
+                }
+                
+                if(!result)
+                {
+                        result = mMediaSource->handleKeyHere(key, mask);
+                }
+        }
+                
+        return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
+{
+        llinfos << "visibility changed to " << (new_visibility?"true":"false") << llendl;
+        if(mMediaSource)
+        {
+                mMediaSource->setVisible( new_visibility );
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLMediaCtrl::handleUnicodeCharHere(llwchar uni_char)
+{
+        BOOL result = FALSE;
+        
+        // only accept 'printable' characters, sigh...
+        if (uni_char >= 32 // discard 'control' characters
+            && uni_char != 127) // SDL thinks this is 'delete' - yuck.
+        {
+                if (mMediaSource)
+                        result = mMediaSource->handleUnicodeCharHere(uni_char);
+        }
+
+        return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::onVisibilityChange ( BOOL new_visibility )
+{
+        // set state of frequent updates automatically if visibility changes
+        if ( new_visibility )
+        {
+                mFrequentUpdates = true;
+        }
+        else
+        {
+                mFrequentUpdates = false;
+        }
+        LLUICtrl::onVisibilityChange(new_visibility);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::reshape( S32 width, S32 height, BOOL called_from_parent )
+{
+        S32 screen_width = mIgnoreUIScale ? llround((F32)width * LLUI::sGLScaleFactor.mV[VX]) : width;
+        S32 screen_height = mIgnoreUIScale ? llround((F32)height * LLUI::sGLScaleFactor.mV[VY]) : height;
+        
+//      llinfos << "reshape called with width = " << width << ", height = " << height << llendl;
+        
+        // when floater is minimized, these sizes are negative
+        if ( mWebBrowserImage && screen_height > 0 && screen_width > 0 )
+        {
+                mWebBrowserImage->resize( screen_width, screen_height );
+                mForceUpdate = true;
+        }
+
+        LLUICtrl::reshape( width, height, called_from_parent );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::navigateBack()
+{
+        if (mMediaSource && mMediaSource->hasMedia())
+        {
+                mMediaSource->getMediaPlugin()->browse_back();
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::navigateForward()
+{
+        if (mMediaSource && mMediaSource->hasMedia())
+        {
+                mMediaSource->getMediaPlugin()->browse_forward();
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLMediaCtrl::canNavigateBack()
+{
+        if (mMediaSource)
+                return mMediaSource->canNavigateBack();
+        else
+                return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLMediaCtrl::canNavigateForward()
+{
+        if (mMediaSource)
+                return mMediaSource->canNavigateForward();
+        else
+                return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::set404RedirectUrl( std::string redirect_url )
+{
+        if(mMediaSource && mMediaSource->hasMedia())
+                mMediaSource->getMediaPlugin()->set_status_redirect( 404, redirect_url );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::clr404RedirectUrl()
+{
+        if(mMediaSource && mMediaSource->hasMedia())
+                mMediaSource->getMediaPlugin()->set_status_redirect(404, "");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::navigateTo( std::string url_in, std::string mime_type)
+{
+        // don't browse to anything that starts with secondlife:// or sl://
+        const std::string protocol1 = "secondlife://";
+        const std::string protocol2 = "sl://";
+        if ((LLStringUtil::compareInsensitive(url_in.substr(0, protocol1.length()), protocol1) == 0) ||
+            (LLStringUtil::compareInsensitive(url_in.substr(0, protocol2.length()), protocol2) == 0))
+        {
+                // TODO: Print out/log this attempt?
+                // llinfos << "Rejecting attempt to load restricted website :" << urlIn << llendl;
+                return;
+        }
+        
+        if (mMediaSource)
+        {
+                mCurrentNavUrl = url_in;
+                mMediaSource->navigateTo(url_in, mime_type, mime_type.empty());
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::navigateToLocalPage( const std::string& subdir, const std::string& filename_in )
+{
+        std::string language = LLUI::getLanguage();
+        std::string delim = gDirUtilp->getDirDelimiter();
+        std::string filename;
+
+        filename += subdir;
+        filename += delim;
+        filename += filename_in;
+
+        std::string expanded_filename = gDirUtilp->findSkinnedFilename("html", language, filename);
+
+        if (! gDirUtilp->fileExists(expanded_filename))
+        {
+                if (language != "en-us")
+                {
+                        expanded_filename = gDirUtilp->findSkinnedFilename("html", "en-us", filename);
+                        if (! gDirUtilp->fileExists(expanded_filename))
+                        {
+                                llwarns << "File " << subdir << delim << filename_in << "not found" << llendl;
+                                return;
+                        }
+                }
+                else
+                {
+                        llwarns << "File " << subdir << delim << filename_in << "not found" << llendl;
+                        return;
+                }
+        }
+        if (mMediaSource)
+        {
+                mCurrentNavUrl = expanded_filename;
+                mMediaSource->navigateTo(expanded_filename, "text/html", false);
+        }
+
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::navigateHome()
+{
+        if( mHomePageUrl.length() )
+        {
+                if (mMediaSource)
+                        mMediaSource->navigateTo(mHomePageUrl);
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::setHomePageUrl( const std::string urlIn )
+{
+        mHomePageUrl = urlIn;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLMediaCtrl::setCaretColor(unsigned int red, unsigned int green, unsigned int blue)
+{
+        //NOOP
+        return false;
+}
+////////////////////////////////////////////////////////////////////////////////
+//
+std::string LLMediaCtrl::getHomePageUrl()
+{
+        return  mHomePageUrl;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLPluginClassMedia* LLMediaCtrl::getMediaPlugin()
+{ 
+        return mMediaSource.isNull() ? NULL : mMediaSource->getMediaPlugin(); 
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::draw()
+{
+        if ( ! mWebBrowserImage )
+                return;
+
+        if ( gRestoreGL == 1 )
+        {
+                LLRect r = getRect();
+                reshape( r.getWidth(), r.getHeight(), FALSE );
+                return;
+        };
+
+        // NOTE: optimization needed here - probably only need to do this once
+        // unless tearoffs change the parent which they probably do.
+        const LLUICtrl* ptr = findRootMostFocusRoot();
+        if ( ptr && ptr->hasFocus() )
+        {
+                setFrequentUpdates( true );
+        }
+        else
+        {
+                setFrequentUpdates( false );
+        };
+
+        // alpha off for this
+        LLGLSUIDefault gls_ui;
+        LLGLDisable gls_alphaTest( GL_ALPHA_TEST );
+
+        gGL.pushMatrix();
+        {
+                if (mIgnoreUIScale)
+                {
+                        glLoadIdentity();
+                        // font system stores true screen origin, need to scale this by UI scale factor
+                        // to get render origin for this view (with unit scale)
+                        gGL.translatef(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), 
+                                                floorf(LLFontGL::sCurOrigin.mY * LLUI::sGLScaleFactor.mV[VY]), 
+                                                LLFontGL::sCurOrigin.mZ);
+                }
+
+                // scale texture to fit the space using texture coords
+                gGL.getTexUnit(0)->bind(mWebBrowserImage->getTexture());
+                gGL.color4fv( LLColor4::white.mV );
+                F32 max_u = ( F32 )mWebBrowserImage->getMediaWidth() / ( F32 )mWebBrowserImage->getWidth();
+                F32 max_v = ( F32 )mWebBrowserImage->getMediaHeight() / ( F32 )mWebBrowserImage->getHeight();
+
+                LLRect r = getRect();
+                S32 width, height;
+                S32 x_offset = 0;
+                S32 y_offset = 0;
+                
+                if(mStretchToFill)
+                {
+                        if(mMaintainAspectRatio)
+                        {
+                                F32 media_aspect = (F32)(mWebBrowserImage->getMediaWidth()) / (F32)(mWebBrowserImage->getMediaHeight());
+                                F32 view_aspect = (F32)(r.getWidth()) / (F32)(r.getHeight());
+                                if(media_aspect > view_aspect)
+                                {
+                                        // max width, adjusted height
+                                        width = r.getWidth();
+                                        height = llmin(llmax(S32(width / media_aspect), 0), r.getHeight());
+                                }
+                                else
+                                {
+                                        // max height, adjusted width
+                                        height = r.getHeight();
+                                        width = llmin(llmax(S32(height * media_aspect), 0), r.getWidth());
+                                }
+                        }
+                        else
+                        {
+                                width = r.getWidth();
+                                height = r.getHeight();
+                        }
+                }
+                else
+                {
+                        width = llmin(mWebBrowserImage->getMediaWidth(), r.getWidth());
+                        height = llmin(mWebBrowserImage->getMediaHeight(), r.getHeight());
+                }
+
+                x_offset = (r.getWidth() - width) / 2;
+                y_offset = (r.getHeight() - height) / 2;                
+
+                if (mIgnoreUIScale)
+                {
+                        width = llround((F32)width * LLUI::sGLScaleFactor.mV[VX]);
+                        height = llround((F32)height * LLUI::sGLScaleFactor.mV[VY]);
+                        x_offset = llround((F32)x_offset * LLUI::sGLScaleFactor.mV[VX]);
+                        y_offset = llround((F32)y_offset * LLUI::sGLScaleFactor.mV[VY]);
+                }
+
+                // draw the browser
+                gGL.setSceneBlendType(LLRender::BT_REPLACE);
+                gGL.begin( LLRender::QUADS );
+                if (! mWebBrowserImage->getTextureCoordsOpenGL())
+                {
+                        // render using web browser reported width and height, instead of trying to invert GL scale
+                        gGL.texCoord2f( max_u, 0.f );
+                        gGL.vertex2i( x_offset + width, y_offset + height );
+
+                        gGL.texCoord2f( 0.f, 0.f );
+                        gGL.vertex2i( x_offset, y_offset + height );
+
+                        gGL.texCoord2f( 0.f, max_v );
+                        gGL.vertex2i( x_offset, y_offset );
+
+                        gGL.texCoord2f( max_u, max_v );
+                        gGL.vertex2i( x_offset + width, y_offset );
+                }
+                else
+                {
+                        // render using web browser reported width and height, instead of trying to invert GL scale
+                        gGL.texCoord2f( max_u, max_v );
+                        gGL.vertex2i( x_offset + width, y_offset + height );
+
+                        gGL.texCoord2f( 0.f, max_v );
+                        gGL.vertex2i( x_offset, y_offset + height );
+
+                        gGL.texCoord2f( 0.f, 0.f );
+                        gGL.vertex2i( x_offset, y_offset );
+
+                        gGL.texCoord2f( max_u, 0.f );
+                        gGL.vertex2i( x_offset + width, y_offset );
+                }
+                gGL.end();
+                gGL.setSceneBlendType(LLRender::BT_ALPHA);
+        }
+        gGL.popMatrix();
+
+        // highlight if keyboard focus here. (TODO: this needs some work)
+        if ( mBorder->getVisible() )
+                mBorder->setKeyboardFocusHighlight( gFocusMgr.childHasKeyboardFocus( this ) );
+
+        
+        LLUICtrl::draw();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLMediaCtrl::convertInputCoords(S32& x, S32& y)
+{
+        x = mIgnoreUIScale ? llround((F32)x * LLUI::sGLScaleFactor.mV[VX]) : x;
+        if ( ! mWebBrowserImage->getTextureCoordsOpenGL() )
+        {
+                y = mIgnoreUIScale ? llround((F32)(y) * LLUI::sGLScaleFactor.mV[VY]) : y;
+        }
+        else
+        {
+                y = mIgnoreUIScale ? llround((F32)(getRect().getHeight() - y) * LLUI::sGLScaleFactor.mV[VY]) : getRect().getHeight() - y;
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// static 
+bool LLMediaCtrl::onClickLinkExternalTarget(const LLSD& notification, const LLSD& response )
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if ( 0 == option )
+        {
+                // open in external browser because we don't support 
+                // creation of our own secondary browser windows
+                LLWeb::loadURLExternal( notification["payload"]["external_url"].asString() );
+        }
+        return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// inherited from LLViewerMediaObserver
+//virtual 
+void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
+{
+        switch(event)
+        {
+                case MEDIA_EVENT_CONTENT_UPDATED:
+                {
+                        // LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CONTENT_UPDATED " << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_TIME_DURATION_UPDATED:
+                {
+                        // LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_TIME_DURATION_UPDATED, time is " << self->getCurrentTime() << " of " << self->getDuration() << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_SIZE_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_SIZE_CHANGED " << LL_ENDL;
+                        LLRect r = getRect();
+                        reshape( r.getWidth(), r.getHeight(), FALSE );
+                };
+                break;
+                
+                case MEDIA_EVENT_CURSOR_CHANGED:
+                {
+                        LL_INFOS("Media") <<  "Media event:  MEDIA_EVENT_CURSOR_CHANGED, new cursor is " << self->getCursorName() << LL_ENDL;
+
+                        std::string cursor = self->getCursorName();
+                        
+                        if(cursor == "arrow")
+                                mLastSetCursor = UI_CURSOR_ARROW;
+                        else if(cursor == "ibeam")
+                                mLastSetCursor = UI_CURSOR_IBEAM;
+                        else if(cursor == "splith")
+                                mLastSetCursor = UI_CURSOR_SIZEWE;
+                        else if(cursor == "splitv")
+                                mLastSetCursor = UI_CURSOR_SIZENS;
+                        else if(cursor == "hand")
+                                mLastSetCursor = UI_CURSOR_HAND;
+                        else // for anything else, default to the arrow
+                                mLastSetCursor = UI_CURSOR_ARROW;
+                };
+                break;
+                
+                case MEDIA_EVENT_NAVIGATE_BEGIN:
+                {
+                        LL_INFOS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_BEGIN, url is " << self->getNavigateURI() << LL_ENDL;
+                        if(mMediaSource && mHideLoading)
+                        {
+                                mMediaSource->suspendUpdates(true);
+                        }
+                };
+                break;
+                
+                case MEDIA_EVENT_NAVIGATE_COMPLETE:
+                {
+                        LL_INFOS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_COMPLETE, result string is: " << self->getNavigateResultString() << LL_ENDL;
+                        if(mMediaSource && mHideLoading)
+                        {
+                                mMediaSource->suspendUpdates(false);
+                        }
+                };
+                break;
+
+                case MEDIA_EVENT_PROGRESS_UPDATED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_PROGRESS_UPDATED, loading at " << self->getProgressPercent() << "%" << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_STATUS_TEXT_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_STATUS_TEXT_CHANGED, new status text is: " << self->getStatusText() << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_LOCATION_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_LOCATION_CHANGED, new uri is: " << self->getLocation() << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_CLICK_LINK_HREF:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CLICK_LINK_HREF, target is \"" << self->getClickTarget() << "\", uri is " << self->getClickURL() << LL_ENDL;
+                        onClickLinkHref(self);
+                };
+                break;
+                
+                case MEDIA_EVENT_CLICK_LINK_NOFOLLOW:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is " << self->getClickURL() << LL_ENDL;
+                        onClickLinkNoFollow(self);
+                };
+                break;
+
+                case MEDIA_EVENT_PLUGIN_FAILED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_PLUGIN_FAILED" << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_PLUGIN_FAILED_LAUNCH:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_PLUGIN_FAILED_LAUNCH" << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_NAME_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_NAME_CHANGED" << LL_ENDL;
+                };
+                break;
+        };
+
+        // chain all events to any potential observers of this object.
+        emitEvent(self, event);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// 
+void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
+{
+        // retrieve the event parameters
+        std::string target = self->getClickTarget();
+        std::string url = self->getClickURL();
+        
+        // if there is a value for the target
+        if ( !target.empty() )
+        {
+                if ( target == "_external" )            
+                {
+                        mExternalUrl = url;
+                        LLSD payload;
+                        payload["external_url"] = mExternalUrl;
+                        LLNotifications::instance().add( "WebLaunchExternalTarget", LLSD(), payload, onClickLinkExternalTarget);
+                        return;
+                }
+        }
+
+        const std::string protocol1( "http://" );
+        const std::string protocol2( "https://" );
+        if( mOpenLinksInExternalBrowser )
+        {
+                if ( !url.empty() )
+                {
+                        if ( LLStringUtil::compareInsensitive( url.substr( 0, protocol1.length() ), protocol1 ) == 0 ||
+                                 LLStringUtil::compareInsensitive( url.substr( 0, protocol2.length() ), protocol2 ) == 0 )
+                        {
+                                LLWeb::loadURLExternal( url );
+                        }
+                }
+        }
+        else
+        if( mOpenLinksInInternalBrowser )
+        {
+                if ( !url.empty() )
+                {
+                        if ( LLStringUtil::compareInsensitive( url.substr( 0, protocol1.length() ), protocol1 ) == 0 ||
+                                 LLStringUtil::compareInsensitive( url.substr( 0, protocol2.length() ), protocol2 ) == 0 )
+                        {
+                                // If we spawn a new LLFloaterHTML, assume we want it to
+                                // follow this LLMediaCtrl's trust for whether or
+                                // not to open secondlife:///app/ links. JC.
+//                              const bool open_links_externally = false;
+//                              LLFloaterHtml::getInstance()->show( 
+//                                      event_in.mStringPayload, 
+//                                              "Second Life Browser",
+//                                                      open_links_externally,
+//                                                              mTrusted);
+                        }
+                }
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// 
+void LLMediaCtrl::onClickLinkNoFollow( LLPluginClassMedia* self )
+{
+        std::string url = self->getClickURL();
+        if (LLURLDispatcher::isSLURLCommand(url)
+                && !mTrusted)
+        {
+                // block handling of this secondlife:///app/ URL
+                LLNotifications::instance().add("UnableToOpenCommandURL");
+                return;
+        }
+
+        LLURLDispatcher::dispatch(url, this, mTrusted);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLWebBrowserTexture::LLWebBrowserTexture( S32 width, S32 height, LLMediaCtrl* browserCtrl, viewer_media_t media_source ) :
+        LLDynamicTexture( 512, 512, 4, ORDER_FIRST, TRUE ),
+        mNeedsUpdate( true ),
+        mNeedsResize( false ),
+        mTextureCoordsOpenGL( true ),
+        mWebBrowserCtrl( browserCtrl ),
+        mMediaSource(media_source)
+{
+        mElapsedTime.start();
+
+        resize( width, height );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLWebBrowserTexture::~LLWebBrowserTexture()
+{
+        mElapsedTime.stop();
+        mMediaSource = NULL;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLWebBrowserTexture::needsRender()
+{
+        bool texture_dirty = false;
+        
+        if ( mWebBrowserCtrl->getFrequentUpdates() || 
+                mWebBrowserCtrl->getAlwaysRefresh() ||
+                mWebBrowserCtrl->getForceUpdate() )
+        {
+                // All of these force an update
+                return TRUE;
+        }
+        
+        // If the texture needs updating, render needs to be called.
+        if (mMediaSource && mMediaSource->hasMedia())
+        {
+                LLPluginClassMedia* media = mMediaSource->getMediaPlugin();
+
+                if(media->textureValid() && media->getDirty())
+                {
+                        texture_dirty = true;
+                }
+        }
+
+
+        return texture_dirty;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+BOOL LLWebBrowserTexture::render()
+{       
+        if(updateBrowserTexture())
+        {
+                // updateBrowserTexture already verified that the media plugin is there and the texture is valid.
+                LLPluginClassMedia* media_plugin = mMediaSource->getMediaPlugin();
+                LLRect dirty_rect;
+                
+                if(mNeedsUpdate)
+                {
+                        // If we need an update, use the whole rect instead of the dirty rect.
+                        dirty_rect.mLeft = 0;
+                        dirty_rect.mBottom = 0;
+                        dirty_rect.mRight = media_plugin->getWidth();
+                        dirty_rect.mTop = media_plugin->getHeight();
+                }
+                else
+                {
+                        mNeedsUpdate = media_plugin->getDirty(&dirty_rect);
+                }
+                
+                if ( mNeedsUpdate )
+                {                       
+                        mNeedsUpdate = false;
+                        mWebBrowserCtrl->setForceUpdate(false);
+
+                        // Constrain the dirty rect to be inside the texture
+                        S32 x_pos = llmax(dirty_rect.mLeft, 0);
+                        S32 y_pos = llmax(dirty_rect.mBottom, 0);
+                        S32 width = llmin(dirty_rect.mRight, getWidth()) - x_pos;
+                        S32 height = llmin(dirty_rect.mTop, getHeight()) - y_pos;
+                        
+                        if(width > 0 && height > 0)
+                        {
+                                U8* data = media_plugin->getBitsData();
+
+                                // Offset the pixels pointer to match x_pos and y_pos
+                                data += ( x_pos * media_plugin->getTextureDepth() * media_plugin->getBitsWidth() );
+                                data += ( y_pos * media_plugin->getTextureDepth() );
+                                
+                                mTexture->setSubImage(
+                                                data, 
+                                                media_plugin->getBitsWidth(), 
+                                                media_plugin->getBitsHeight(),
+                                                x_pos, 
+                                                y_pos, 
+                                                width, 
+                                                height,
+                                                TRUE);  // force a fast update (i.e. don't call analyzeAlpha, etc.)
+                        }
+                
+                        media_plugin->resetDirty();
+
+                        return TRUE;
+                };
+        };
+        
+        return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+S32 LLWebBrowserTexture::getMediaWidth()
+{
+        return mMediaWidth;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+S32 LLWebBrowserTexture::getMediaHeight()
+{
+        return mMediaHeight;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLWebBrowserTexture::setNeedsUpdate()
+{
+        mNeedsUpdate = true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLWebBrowserTexture::getNeedsUpdate()
+{
+        return mNeedsUpdate;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLWebBrowserTexture::getTextureCoordsOpenGL()
+{
+        return mTextureCoordsOpenGL;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLWebBrowserTexture::resize( S32 new_width, S32 new_height )
+{
+        F32 scale_ratio = 1.f;
+        if (new_width > MAX_DIMENSION)
+        {
+                scale_ratio = (F32)MAX_DIMENSION / (F32)new_width;
+        }
+        if (new_height > MAX_DIMENSION)
+        {
+                scale_ratio = llmin(scale_ratio, (F32)MAX_DIMENSION / (F32)new_height);
+        }
+
+        mMediaWidth = llround(scale_ratio * (F32)new_width);
+        mMediaHeight = llround(scale_ratio * (F32)new_height);
+        
+        adjustSize();
+}
+
+bool LLWebBrowserTexture::adjustSize()
+{
+        if (mMediaSource && mMediaSource->hasMedia())
+        {
+                int natural_width = mMediaSource->getMediaPlugin()->getNaturalWidth();
+                int natural_height = mMediaSource->getMediaPlugin()->getNaturalHeight();
+                
+                if(natural_width != 0)
+                {
+                        // If the media has a "natural size", use it.
+                        mMediaWidth = natural_width;
+                        mMediaHeight = natural_height;
+                }
+
+                mMediaSource->setSize(mMediaWidth, mMediaHeight);
+                mNeedsResize = false;
+
+                return true;
+        }
+        else
+        {
+                // The media isn't fully initialized yet, delay the resize until later.
+                mNeedsResize = true;
+        }
+        
+        return false;
+}
+
+bool LLWebBrowserTexture::updateBrowserTexture()
+{
+        if (!adjustSize())
+                return false;
+                
+        LLPluginClassMedia* media = mMediaSource->getMediaPlugin();
+        
+        if(!media->textureValid())
+                return false;
+        
+        if(mMediaSource->mNeedsNewTexture
+                || media->getTextureWidth() != mWidth
+                || media->getTextureHeight() != mHeight )
+        {
+                releaseGLTexture();
+                
+                mWidth = media->getTextureWidth();
+                mHeight = media->getTextureHeight();
+                mTextureCoordsOpenGL = media->getTextureCoordsOpenGL();
+
+                // will create mWidth * mHeight sized texture, using the texture params specified by the media.
+                LLDynamicTexture::generateGLTexture(
+                                media->getTextureFormatInternal(), 
+                                media->getTextureFormatPrimary(), 
+                                media->getTextureFormatType(), 
+                                media->getTextureFormatSwapBytes());
+
+
+                mMediaSource->mNeedsNewTexture = false;
+        }
+        
+        return true;
+}
+// virtual
+LLXMLNodePtr LLMediaCtrl::getXML(bool save_children) const
+{
+        LLXMLNodePtr node = LLUICtrl::getXML();
+
+        node->setName(LL_WEB_BROWSER_CTRL_TAG);
+
+        return node;
+}
+
+LLView* LLMediaCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+{
+        std::string name("web_browser");
+        node->getAttributeString("name", name);
+
+        std::string start_url("");
+        node->getAttributeString("start_url", start_url );
+
+        BOOL border_visible = true;
+        node->getAttributeBOOL("border_visible", border_visible);
+
+        LLRect rect;
+        createRect(node, rect, parent, LLRect());
+
+        LLMediaCtrl* web_browser = new LLMediaCtrl( name, rect );
+
+        if(node->hasAttribute("caret_color"))
+        {
+                LLColor4 color;
+                LLUICtrlFactory::getAttributeColor(node, "caret_color", color);
+                LLColor4U colorU = LLColor4U(color);
+                web_browser->setCaretColor( colorU.mV[0], colorU.mV[1], colorU.mV[2] );
+        }
+
+        BOOL ignore_ui_scale = web_browser->getIgnoreUIScale();
+        node->getAttributeBOOL("ignore_ui_scale", ignore_ui_scale);
+        web_browser->setIgnoreUIScale((bool)ignore_ui_scale);
+
+        web_browser->initFromXML(node, parent);
+
+        web_browser->setHomePageUrl( start_url );
+
+        web_browser->setBorderVisible( border_visible );
+
+        if(! start_url.empty())
+        {
+                web_browser->navigateHome();
+        }
+
+        return web_browser;
+}
+
+std::string LLMediaCtrl::getCurrentNavUrl()
+{
+        return mCurrentNavUrl;
+}
+
diff --git a/linden/indra/newview/llmediactrl.h b/linden/indra/newview/llmediactrl.h
new file mode 100644
index 0000000..77f59c7
--- /dev/null
+++ b/linden/indra/newview/llmediactrl.h
@@ -0,0 +1,201 @@
+/**
+ * @file llmediactrl.h
+ * @brief Web browser UI control
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
+ * Copyright (c) 2006-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLMediaCtrl_H
+#define LL_LLMediaCtrl_H
+
+#include "llviewermedia.h"
+
+#include "lluictrl.h"
+#include "llframetimer.h"
+#include "lldynamictexture.h"
+
+class LLViewBorder;
+class LLWebBrowserTexture;
+class LLUICtrlFactory;
+
+////////////////////////////////////////////////////////////////////////////////
+//
+class LLMediaCtrl :
+        public LLUICtrl,
+        public LLViewerMediaObserver,
+        public LLViewerMediaEventEmitter
+{
+        public:
+                LLMediaCtrl( const std::string& name, const LLRect& rect );
+                virtual ~LLMediaCtrl();
+
+                void setBorderVisible( BOOL border_visible );
+
+                // For the tutorial window, we don't want to take focus on clicks,
+                // as the examples include how to move around with the arrow
+                // keys.  Thus we keep focus on the app by setting this false.
+                // Defaults to true.
+                void setTakeFocusOnClick( bool take_focus );
+
+                virtual LLXMLNodePtr getXML(bool save_children = true) const;
+                static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+
+                // handle mouse related methods
+                virtual BOOL handleHover( S32 x, S32 y, MASK mask );
+                virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
+                virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
+                virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
+                virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks );
+
+                // navigation
+                void navigateTo( std::string url_in, std::string mime_type = "");
+                void navigateBack();
+                void navigateHome();
+                void navigateForward(); 
+                void navigateToLocalPage( const std::string& subdir, const std::string& filename_in );
+                bool canNavigateBack();
+                bool canNavigateForward();
+                void setOpenInExternalBrowser( bool valIn );
+                void setOpenInInternalBrowser( bool valIn );
+                std::string getCurrentNavUrl();
+
+                // By default, we do not handle "secondlife:///app/" SLURLs, because
+                // those can cause teleports, open windows, etc.  We cannot be sure
+                // that each "click" is actually due to a user action, versus 
+                // Javascript or some other mechanism.  However, we need the search
+                // floater and login page to handle these URLs.  Those are safe
+                // because we control the page content.  See DEV-9530.  JC.
+                void setTrusted( bool valIn );
+
+                void setHomePageUrl( const std::string urlIn );
+                std::string getHomePageUrl();
+
+                // set/clear URL to visit when a 404 page is reached
+                void set404RedirectUrl( std::string redirect_url );
+                void clr404RedirectUrl();
+
+                // accessor/mutator for flag that indicates if frequent updates to texture happen
+                bool getFrequentUpdates() { return mFrequentUpdates; };
+                void setFrequentUpdates( bool frequentUpdatesIn ) {  mFrequentUpdates = frequentUpdatesIn; };
+
+                void setIgnoreUIScale(bool ignore) { mIgnoreUIScale = ignore; }
+                bool getIgnoreUIScale() { return mIgnoreUIScale; }
+
+                void setAlwaysRefresh(bool refresh) { mAlwaysRefresh = refresh; }
+                bool getAlwaysRefresh() { return mAlwaysRefresh; }
+                
+                void setForceUpdate(bool force_update) { mForceUpdate = force_update; }
+                bool getForceUpdate() { return mForceUpdate; }
+
+                LLPluginClassMedia* getMediaPlugin();
+
+                bool setCaretColor( unsigned int red, unsigned int green, unsigned int blue );
+
+
+                // over-rides
+                virtual BOOL handleKeyHere( KEY key, MASK mask);
+                virtual void handleVisibilityChange ( BOOL new_visibility );
+                virtual BOOL handleUnicodeCharHere(llwchar uni_char);
+                virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE);
+                virtual void draw();
+                virtual void onVisibilityChange ( BOOL curVisibilityIn );
+
+                // focus overrides
+                void onFocusLost();
+                void onFocusReceived();
+                
+                // Incoming media event dispatcher
+                virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+
+                // handlers for individual events (could be done inside the switch in handleMediaEvent, they're just individual functions for clarity)
+                void onClickLinkHref( LLPluginClassMedia* self );
+                void onClickLinkNoFollow( LLPluginClassMedia* self );
+                
+        protected:
+                void convertInputCoords(S32& x, S32& y);
+
+        private:
+                static bool onClickLinkExternalTarget( const LLSD&, const LLSD& );
+
+                const S32 mTextureDepthBytes;
+                LLWebBrowserTexture* mWebBrowserImage;
+                LLViewBorder* mBorder;
+                bool mFrequentUpdates;
+                bool mForceUpdate;
+                bool mOpenLinksInExternalBrowser;
+                bool mOpenLinksInInternalBrowser;
+                bool mTrusted;
+                std::string mHomePageUrl;
+                std::string mExternalUrl;
+                std::string mCurrentNavUrl;
+                bool mIgnoreUIScale;
+                bool mAlwaysRefresh;
+                viewer_media_t mMediaSource;
+                bool mTakeFocusOnClick;
+                ECursorType mLastSetCursor;
+                bool mStretchToFill;
+                bool mMaintainAspectRatio;
+                bool mHideLoading;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//
+class LLWebBrowserTexture : public LLDynamicTexture
+{
+LOG_CLASS(LLWebBrowserTexture);
+        public:
+                LLWebBrowserTexture( S32 width, S32 height, LLMediaCtrl* browserCtrl, viewer_media_t media_source );
+                virtual ~LLWebBrowserTexture();
+
+                virtual BOOL needsRender();
+                virtual void preRender( BOOL clear_depth = TRUE ) {};
+                virtual void postRender( BOOL success ) {};
+                virtual BOOL render();
+                
+                bool adjustSize();
+                S32 getMediaWidth();
+                S32 getMediaHeight();
+                bool getNeedsUpdate();
+                void setNeedsUpdate();
+                bool getTextureCoordsOpenGL();
+
+                void resize( S32 new_width, S32 new_height );
+                bool updateBrowserTexture();
+
+        protected:
+                S32 mMediaWidth;
+                S32 mMediaHeight;
+                bool mNeedsUpdate;
+                bool mNeedsResize;
+                bool mTextureCoordsOpenGL;
+                LLFrameTimer mElapsedTime;
+                LLMediaCtrl* mWebBrowserCtrl;
+                viewer_media_t mMediaSource;
+};
+
+#endif // LL_LLMediaCtrl_H
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index f2ec414..a62973a 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -34,7 +34,7 @@
 
 #include "llmediaremotectrl.h"
 
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "lliconctrl.h"
 #include "llmimetypes.h"
 #include "lloverlaybar.h"
@@ -86,6 +86,7 @@ BOOL LLMediaRemoteCtrl::postBuild()
         childSetAction("media_stop",LLOverlayBar::mediaStop,this);
         childSetAction("music_stop",LLOverlayBar::toggleMusicPlay,this);
         childSetAction("media_pause",LLOverlayBar::toggleMediaPlay,this);
+        childSetAction("music_pause",LLOverlayBar::toggleMusicPlay,this);
 
         childSetAction("expand", onClickExpandBtn, this);       
         return TRUE;
@@ -135,9 +136,11 @@ void* LLMediaRemoteCtrl::createVolumePanel(void* data)
 // Virtual
 void LLMediaRemoteCtrl::setToolTip(const std::string& msg)
 {
-        std::string mime_type = LLMIMETypes::translate(LLViewerMedia::getMimeType());
-        std::string tool_tip = LLMIMETypes::findToolTip(LLViewerMedia::getMimeType());
-        std::string play_tip = LLMIMETypes::findPlayTip(LLViewerMedia::getMimeType());
+        // TODO: this gets removed for Media on a Prim
+        
+        const std::string mime_type = LLViewerParcelMedia::getMimeType();
+        std::string tool_tip = LLMIMETypes::findToolTip(mime_type);
+        std::string play_tip = LLMIMETypes::findPlayTip(mime_type);
         // childSetToolTip("media_stop", mControls->getString("stop_label") + "\n" + tool_tip);
         childSetToolTip("media_icon", tool_tip);
         childSetToolTip("media_play", play_tip);
@@ -150,6 +153,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
         bool stop_media_enabled = false;
         bool play_music_enabled = false;
         bool stop_music_enabled = false;
+        bool music_show_pause = false;
         bool media_show_pause = false;
         LLColor4 music_icon_color = LLUI::sColorsGroup->getColor( "IconDisabledColor" );
         LLColor4 media_icon_color = LLUI::sColorsGroup->getColor( "IconDisabledColor" );
@@ -161,7 +165,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 
         if (gSavedSettings.getBOOL("AudioStreamingVideo"))
         {
-                if ( parcel && parcel->getMediaURL()[0])
+                if ( parcel && !parcel->getMediaURL().empty())
                 {
                         // Set the tooltip
                         // Put this text into xui file
@@ -171,23 +175,22 @@ void LLMediaRemoteCtrl::enableMediaButtons()
                         play_media_enabled = true;
                         media_icon_color = LLUI::sColorsGroup->getColor( "IconEnabledColor" );
 
-                        LLMediaBase::EStatus status = LLViewerParcelMedia::getStatus();
+                        LLViewerMediaImpl::EMediaStatus status = LLViewerParcelMedia::getStatus();
                         switch(status)
                         {
-                        case LLMediaBase::STATUS_STOPPED:
-                        case LLMediaBase::STATUS_UNKNOWN:
+                        case LLViewerMediaImpl::MEDIA_NONE:
                                 media_show_pause = false;
                                 stop_media_enabled = false;
                                 break;
-                        case LLMediaBase::STATUS_STARTED:
-                        case LLMediaBase::STATUS_NAVIGATING:
-                        case LLMediaBase::STATUS_RESETTING:
+                        case LLViewerMediaImpl::MEDIA_LOADING:
+                        case LLViewerMediaImpl::MEDIA_LOADED:
+                        case LLViewerMediaImpl::MEDIA_PLAYING:
                                 // HACK: only show the pause button for movie types
                                 media_show_pause = LLMIMETypes::widgetType(parcel->getMediaType()) == "movie" ? true : false;
                                 stop_media_enabled = true;
                                 play_media_enabled = false;
                                 break;
-                        case LLMediaBase::STATUS_PAUSED:
+                        case LLViewerMediaImpl::MEDIA_PAUSED:
                                 media_show_pause = false;
                                 stop_media_enabled = true;
                                 break;
@@ -197,46 +200,42 @@ void LLMediaRemoteCtrl::enableMediaButtons()
                         }
                 }
         }
+        
         if (gSavedSettings.getBOOL("AudioStreamingMusic") && gAudiop)
         {
-        
-                if ( parcel && parcel->getMusicURL()[0])
+                if ( parcel && !parcel->getMusicURL().empty())
                 {
+                        play_music_enabled = true;
                         music_icon_color = LLUI::sColorsGroup->getColor( "IconEnabledColor" );
 
                         if (gOverlayBar->musicPlaying())
                         {
-                                play_music_enabled = false;
+                                music_show_pause = true;
                                 stop_music_enabled = true;
                         }
                         else
                         {
-                                play_music_enabled = true;
+                                music_show_pause = false;
                                 stop_music_enabled = false;
                         }
                 }
-                // if no mime type has been set disable play
-                if( LLViewerMedia::getMimeType().empty() 
-                        || LLViewerMedia::getMimeType() == "none/none")
-                {
-                        play_media_enabled = false;
-                        stop_media_enabled = false;
-                }
+                // Don't test the mime-type: this is not updated in a consistent basis. The existence of a valid gAudiop is enough guarantee.
         }
         const std::string media_icon_name = LLMIMETypes::findIcon(media_type);
-
         LLButton* music_play_btn = getChild<LLButton>("music_play");
         LLButton* music_stop_btn = getChild<LLButton>("music_stop");
-
-        music_play_btn->setEnabled(play_music_enabled);
-        music_stop_btn->setEnabled(stop_music_enabled);
-        childSetColor("music_icon", music_icon_color);
-
+        LLButton* music_pause_btn = getChild<LLButton>("music_pause");
         LLButton* media_play_btn = getChild<LLButton>("media_play");
         LLButton* media_stop_btn = getChild<LLButton>("media_stop");
         LLButton* media_pause_btn = getChild<LLButton>("media_pause");
         LLIconCtrl* media_icon = getChild<LLIconCtrl>("media_icon");
 
+        music_play_btn->setEnabled(play_music_enabled);
+        music_stop_btn->setEnabled(stop_music_enabled);
+        music_pause_btn->setEnabled(music_show_pause);
+        music_pause_btn->setVisible(music_show_pause);
+        music_play_btn->setVisible(! music_show_pause);
+        childSetColor("music_icon", music_icon_color);
         if(!media_icon_name.empty())
         {
                 media_icon->setImage(media_icon_name);
diff --git a/linden/indra/newview/llmimetypes.cpp b/linden/indra/newview/llmimetypes.cpp
index bfbc81a..525e89c 100644
--- a/linden/indra/newview/llmimetypes.cpp
+++ b/linden/indra/newview/llmimetypes.cpp
@@ -46,6 +46,8 @@ std::string sDefaultWidgetType;
         // Returned when we don't know what widget set to use
 std::string sDefaultImpl;
         // Returned when we don't know what impl to use
+std::string sXMLFilename; 
+    // Squirrel away XML filename so we know how to reset
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -146,6 +148,8 @@ bool LLMIMETypes::parseMIMETypes(const std::string& xml_filename)
                         sWidgetMap[set_name] = info;
                 }
         }
+
+        sXMLFilename = xml_filename;
         return true;
 }
 
@@ -267,3 +271,23 @@ bool LLMIMETypes::findAllowLooping(const std::string& mime_type)
         }
         return allow_looping;
 }
+
+// static
+bool LLMIMETypes::isTypeHandled(const std::string& mime_type)
+{
+        mime_info_map_t::const_iterator it = sMap.find(mime_type);
+        if (it != sMap.end())
+        {
+                return true;
+        }
+        return false;
+}
+
+// static
+void LLMIMETypes::reload(void*)
+{
+        sMap.clear();
+        sWidgetMap.clear();
+        (void)LLMIMETypes::parseMIMETypes(sXMLFilename);
+}
+
diff --git a/linden/indra/newview/llmimetypes.h b/linden/indra/newview/llmimetypes.h
index 7a50c29..b217ce7 100644
--- a/linden/indra/newview/llmimetypes.h
+++ b/linden/indra/newview/llmimetypes.h
@@ -72,6 +72,12 @@ public:
         static bool findAllowLooping(const std::string& mime_type);
                 // accessor for flag to enable/disable media looping checkbox
 
+        static bool isTypeHandled(const std::string& mime_type);
+                // determines if the specific mime type is handled by the media system
+
+        static void reload(void*);
+                // re-loads the MIME types file from the file path last passed into parseMIMETypes
+
 public:
         struct LLMIMEInfo
         {
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 6191a01..db4422d 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -38,7 +38,7 @@
 #include "lloverlaybar.h"
 
 #include "aoremotectrl.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llrender.h"
 #include "llagent.h"
 #include "llbutton.h"
@@ -63,7 +63,7 @@
 #include "llvoiceclient.h"
 #include "llvoavatar.h"
 #include "llvoiceremotectrl.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 #include "llwindlightremotectrl.h"
 #include "llselectmgr.h"
 
@@ -75,13 +75,14 @@ LLOverlayBar *gOverlayBar = NULL;
 
 extern S32 MENU_BAR_HEIGHT;
 
-
+//awfixme
+/*
 class LLTitleObserver
         :       public LLMediaObserver
 {
 public:
         void init(std::string url);
-        /*virtual*/ void onMediaTitleChange(const EventType& event_in);
+        *//*virtual*//* void onMediaTitleChange(const EventType& event_in);
 private:
         LLMediaBase* mMediaSource;
 };
@@ -120,7 +121,7 @@ void LLTitleObserver::onMediaTitleChange(const EventType& event_in)
         chat.mText = playing_msg;
         LLFloaterChat::addChat(chat, FALSE, FALSE);
 }
-
+*/
 
 //
 // Functions
@@ -445,11 +446,11 @@ void LLOverlayBar::toggleMediaPlay(void*)
         }
 
         
-        if (LLViewerMedia::isMediaPaused())
+        if (LLViewerParcelMedia::getStatus() == LLViewerMediaImpl::MEDIA_PAUSED)
         {
                 LLViewerParcelMedia::start();
         }
-        else if(LLViewerMedia::isMediaPlaying())
+        else if(LLViewerParcelMedia::getStatus() == LLViewerMediaImpl::MEDIA_PLAYING)
         {
                 LLViewerParcelMedia::pause();
         }
@@ -490,7 +491,7 @@ void LLOverlayBar::toggleMusicPlay(void*)
         //                      if ( gAudiop->isInternetStreamPlaying() == 0 )
                                 {
                                         gAudiop->startInternetStream(parcel->getMusicURL());
-                                        sTitleObserver.init(parcel->getMusicURL());
+//awfixme                                       sTitleObserver.init(parcel->getMusicURL());
                                 }
                         }
                 }
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 2bb3ab4..d4c8e9f 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -42,7 +42,7 @@
 #include "llfontgl.h"
 
 // project includes
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
@@ -105,7 +105,6 @@ void LLPanelAudioPrefs::refreshValues()
         mPreviousMusicVolume = gSavedSettings.getF32("AudioLevelMusic");
         mPreviousMediaVolume = gSavedSettings.getF32("AudioLevelMedia");
         mPreviousDoppler = gSavedSettings.getF32("AudioLevelDoppler");
-        mPreviousDistance = gSavedSettings.getF32("AudioLevelDistance");
         mPreviousRolloff = gSavedSettings.getF32("AudioLevelRolloff");
 
         mPreviousMoneyThreshold = gSavedSettings.getF32("UISndMoneyChangeThreshold");
@@ -134,7 +133,6 @@ void LLPanelAudioPrefs::cancel()
         gSavedSettings.setF32("AudioLevelMusic", mPreviousMusicVolume);
         gSavedSettings.setF32("AudioLevelMedia", mPreviousMediaVolume);
         gSavedSettings.setF32("AudioLevelDoppler", mPreviousDoppler );
-        gSavedSettings.setF32("AudioLevelDistance", mPreviousDistance );
         gSavedSettings.setF32("AudioLevelRolloff", mPreviousRolloff );
 
         gSavedSettings.setF32("UISndMoneyChangeThreshold", mPreviousMoneyThreshold );
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 33f4cd6..288dbcd 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -64,6 +64,7 @@
 #include "llmutelist.h"
 #include "llpanelclassified.h"
 #include "llpanelpick.h"
+#include "llpluginclassmedia.h"
 #include "llscrolllistctrl.h"
 #include "llstatusbar.h"
 #include "lltabcontainer.h"
@@ -410,14 +411,12 @@ BOOL LLPanelAvatarWeb::postBuild(void)
 
         childSetControlName("auto_load","AutoLoadWebProfiles");
 
-        mWebBrowser = getChild<LLWebBrowserCtrl>("profile_html");
+        mWebBrowser = getChild<LLMediaCtrl>("profile_html");
+        mWebBrowser->addObserver(this);
 
         // links open in internally 
         mWebBrowser->setOpenInExternalBrowser( false );
 
-        // observe browser events
-        mWebBrowser->addObserver( this );
-
         return TRUE;
 }
 
@@ -476,18 +475,22 @@ LLPanelAvatarWeb::LLPanelAvatarWeb(const std::string& name, const LLRect& rect,
 
 LLPanelAvatarWeb::~LLPanelAvatarWeb()
 {
-        // stop observing browser events
-        if  ( mWebBrowser )
+}
+
+void LLPanelAvatarWeb::refresh()
+{
+        if (mNavigateTo != "")
         {
-                mWebBrowser->remObserver( this );
-        };
+                llinfos << "Loading " << mNavigateTo << llendl;
+                mWebBrowser->navigateTo( mNavigateTo );
+                mNavigateTo = "";
+        }
 }
 
+
 void LLPanelAvatarWeb::enableControls(BOOL self)
 {       
         childSetEnabled("url_edit",self);
-        childSetVisible("status_text",!self && !mHome.empty());
-        childSetText("status_text", LLStringUtil::null);
 }
 
 void LLPanelAvatarWeb::setWebURL(std::string url)
@@ -511,11 +514,8 @@ void LLPanelAvatarWeb::setWebURL(std::string url)
         else
         {
                 childSetVisible("profile_html",false);
+                childSetVisible("status_text", false);
         }
-
-        BOOL own_avatar = (getPanelAvatar()->getAvatarID() == gAgent.getID() );
-        childSetVisible("status_text",!own_avatar && !mHome.empty());
-        
 }
 
 // static
@@ -538,13 +538,15 @@ void LLPanelAvatarWeb::load(std::string url)
 {
         bool have_url = (!url.empty());
 
+        
+        childSetVisible("profile_html", have_url);
+        childSetVisible("status_text", have_url);
+        childSetText("status_text", LLStringUtil::null);
+
         if (have_url)
         {
-                llinfos << "Loading " << url << llendl;
-                mWebBrowser->navigateTo( url );
+                mNavigateTo = url;
         }
-
-        childSetVisible("profile_html", have_url);
 }
 
 //static
@@ -586,14 +588,22 @@ void LLPanelAvatarWeb::onCommitLoad(LLUICtrl* ctrl, void* data)
         }
 }
 
-void LLPanelAvatarWeb::onStatusTextChange( const EventType& eventIn )
-{
-        childSetText("status_text", eventIn.getStringValue() );
-}
-
-void LLPanelAvatarWeb::onLocationChange( const EventType& eventIn )
+void LLPanelAvatarWeb::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 {
-        childSetText("url_edit", eventIn.getStringValue() );
+        switch(event)
+        {
+                case MEDIA_EVENT_STATUS_TEXT_CHANGED:
+                        childSetText("status_text", self->getStatusText() );
+                break;
+                
+                case MEDIA_EVENT_LOCATION_CHANGED:
+                        childSetText("url_edit", self->getLocation() );
+                break;
+                
+                default:
+                        // Having a default case makes the compiler happy.
+                break;
+        }
 }
 
 
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 72a47f5..b687cd8 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -36,7 +36,7 @@
 #include "llpanel.h"
 #include "v3dmath.h"
 #include "lluuid.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 
 class LLButton;
 class LLCheckBoxCtrl;
@@ -55,7 +55,7 @@ class LLViewerImage;
 class LLViewerObject;
 class LLMessageSystem;
 class LLIconCtrl;
-class LLWebBrowserCtrl;
+class LLMediaCtrl;
 
 enum EOnlineStatus
 {
@@ -137,13 +137,15 @@ private:
 // WARNING!  The order of the inheritance here matters!!  Do not change.  - KLW
 class LLPanelAvatarWeb : 
         public LLPanelAvatarTab
-        , public LLWebBrowserCtrlObserver
+        , public LLViewerMediaObserver
 {
 public:
         LLPanelAvatarWeb(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
         /*virtual*/ ~LLPanelAvatarWeb();
         /*virtual*/ BOOL        postBuild(void);
 
+        /*virtual*/ void refresh();
+
         void enableControls(BOOL own_avatar);
 
         void setWebURL(std::string url);
@@ -154,13 +156,13 @@ public:
         static void onCommitURL(LLUICtrl* ctrl, void* data);
         static void onClickWebProfileHelp(void *);
 
-        // browser observer impls
-        virtual void onStatusTextChange( const EventType& eventIn );
-        virtual void onLocationChange( const EventType& eventIn );
+        // inherited from LLViewerMediaObserver
+        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
 
 private:
         std::string                     mHome;
-        LLWebBrowserCtrl*       mWebBrowser;
+        std::string         mNavigateTo;
+        LLMediaCtrl*            mWebBrowser;
 };
 
 
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 36fc86d..2250012 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -142,7 +142,7 @@ public:
                 const bool from_search = true;
                 LLPanelClassified::sendClassifiedClickMessage(classified_id, "teleport", from_search);
                 // Invoke teleport
-                LLWebBrowserCtrl* web = NULL;
+                LLMediaCtrl* web = NULL;
                 const bool trusted_browser = true;
                 return LLURLDispatcher::dispatch(url, web, trusted_browser);
         }
diff --git a/linden/indra/newview/llpaneldebug.cpp b/linden/indra/newview/llpaneldebug.cpp
index c804fce..745daf5 100644
--- a/linden/indra/newview/llpaneldebug.cpp
+++ b/linden/indra/newview/llpaneldebug.cpp
@@ -42,7 +42,7 @@
 #include "llfontgl.h"
 
 // project includes
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llcolorswatch.h"
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 609f5cc..14c4a90 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -50,6 +50,7 @@
 #include "llviewercontrol.h"
 #include "llmenucommands.h"
 #include "llmenugl.h"
+#include "llpluginclassmedia.h"
 #include "lltextbox.h"
 #include "lluiconstants.h"
 #include "llviewerimagelist.h"
@@ -143,9 +144,11 @@ BOOL LLPanelDirFind::postBuild()
         }
         
         
-        mWebBrowser = getChild<LLWebBrowserCtrl>(mBrowserName);
+        mWebBrowser = getChild<LLMediaCtrl>(mBrowserName);
         if (mWebBrowser)
         {
+                mWebBrowser->addObserver(this);
+                
                 // new pages appear in same window as the results page now
                 mWebBrowser->setOpenInInternalBrowser( false );
                 mWebBrowser->setOpenInExternalBrowser( false ); 
@@ -156,9 +159,6 @@ BOOL LLPanelDirFind::postBuild()
                 // redirect 404 pages from S3 somewhere else
                 mWebBrowser->set404RedirectUrl( getString("redirect_404_url") );
 
-                // Track updates for progress display.
-                mWebBrowser->addObserver(this);
-
                 navigateToDefaultPage();
         }
 
@@ -167,8 +167,6 @@ BOOL LLPanelDirFind::postBuild()
 
 LLPanelDirFind::~LLPanelDirFind()
 {
-        if (mWebBrowser) 
-                mWebBrowser->remObserver(this);
 }
 
 // virtual
@@ -485,19 +483,27 @@ void LLPanelDirFind::onClickSearch(void* data)
         LLFloaterDirectory::sNewSearchCount++;
 }
 
-void LLPanelDirFind::onNavigateBegin( const EventType& eventIn )
-{
-        childSetText("status_text", getString("loading_text"));
-}
-
-void LLPanelDirFind::onNavigateComplete( const EventType& eventIn )
+void LLPanelDirFind::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 {
-        childSetText("status_text", getString("done_text"));
-}
-
-void LLPanelDirFind::onLocationChange( const EventType& eventIn )
-{
-        llinfos << eventIn.getStringValue() << llendl;
+        switch(event)
+        {
+                case MEDIA_EVENT_NAVIGATE_BEGIN:
+                        childSetText("status_text", getString("loading_text"));
+                break;
+                
+                case MEDIA_EVENT_NAVIGATE_COMPLETE:
+                        childSetText("status_text", getString("done_text"));
+                break;
+                
+                case MEDIA_EVENT_LOCATION_CHANGED:
+                        // Debugging info to console
+                        llinfos << self->getLocation() << llendl;
+                break;
+
+                default:
+                        // Having a default case makes the compiler happy.
+                break;
+        }
 }
 
 //---------------------------------------------------------------------------
diff --git a/linden/indra/newview/llpaneldirfind.h b/linden/indra/newview/llpaneldirfind.h
index 1a97f4b..d3dda6e 100644
--- a/linden/indra/newview/llpaneldirfind.h
+++ b/linden/indra/newview/llpaneldirfind.h
@@ -34,19 +34,18 @@
 #define LL_LLPANELDIRFIND_H
 
 #include "llpaneldirbrowser.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 
 class LLUICtrl;
 class LLLineEditor;
 class LLPanelDirFindAll;
 class LLFloaterDirectory;
-class LLWebBrowserCtrlObserver;
 
 // This class in an abstract base class for all new style search widgets.  It contains a pointer to a web browser control
 // 
 class LLPanelDirFind
 :       public LLPanelDirBrowser,
-        public LLWebBrowserCtrlObserver
+        public LLViewerMediaObserver
 {
 public:
         LLPanelDirFind(const std::string& name, LLFloaterDirectory* floater, const std::string& browser_name);
@@ -73,15 +72,11 @@ private:
         static void onCommitSearch(LLUICtrl*, void* data);
         static void onClickHelp( void* data );
 
-        /*virtual*/ void onNavigateBegin( const EventType& eventIn );
-        /*virtual*/ void onNavigateComplete( const EventType& eventIn );
-
-                // Used to update progress indicator
-        /*virtual*/ void onLocationChange( const EventType& eventIn );
-                // Debugging info to console
+        // inherited from LLViewerMediaObserver
+        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
 
 protected:
-        LLWebBrowserCtrl* mWebBrowser;
+        LLMediaCtrl* mWebBrowser;
         std::string mBrowserName;
 };
 
diff --git a/linden/indra/newview/llpaneldirgroups.cpp b/linden/indra/newview/llpaneldirgroups.cpp
index 1aa2e86..4119514 100644
--- a/linden/indra/newview/llpaneldirgroups.cpp
+++ b/linden/indra/newview/llpaneldirgroups.cpp
@@ -41,6 +41,7 @@
 #include "llqueryflags.h"
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
+#include "llmediactrl.h"
 
 LLPanelDirGroups::LLPanelDirGroups(const std::string& name, LLFloaterDirectory* floater)
         :       LLPanelDirBrowser(name, floater)
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index 68e603e..b9a40da 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -66,6 +66,7 @@
 #include "llviewerstats.h"
 #include "llviewerwindow.h"
 #include "lluictrlfactory.h"
+#include "llpluginclassmedia.h"
 
 //
 // Methods
@@ -77,7 +78,6 @@ BOOL	LLPanelFace::postBuild()
         LLTextureCtrl*  mTextureCtrl;
         LLColorSwatchCtrl*      mColorSwatch;
 
-        LLTextBox*              mLabelTexGen;
         LLComboBox*             mComboTexGen;
 
         LLCheckBoxCtrl  *mCheckFullbright;
@@ -85,7 +85,6 @@ BOOL	LLPanelFace::postBuild()
         LLTextBox*              mLabelColorTransp;
         LLSpinCtrl*             mCtrlColorTransp;               // transparency = 1 - alpha
 
-        LLTextBox*      mLabelGlow;
         LLSpinCtrl*     mCtrlGlow;
 
         setMouseOpaque(FALSE);
@@ -156,7 +155,7 @@ BOOL	LLPanelFace::postBuild()
                 mCheckFullbright->setCommitCallback(LLPanelFace::onCommitFullbright);
                 mCheckFullbright->setCallbackUserData( this );
         }
-        mLabelTexGen = getChild<LLTextBox>("tex gen");
+
         mComboTexGen = getChild<LLComboBox>("combobox texgen");
         if(mComboTexGen)
         {
@@ -165,7 +164,6 @@ BOOL	LLPanelFace::postBuild()
                 mComboTexGen->setCallbackUserData( this );
         }
 
-        mLabelGlow = getChild<LLTextBox>("glow label");
         mCtrlGlow = getChild<LLSpinCtrl>("glow");
         if(mCtrlGlow)
         {
@@ -507,11 +505,6 @@ void LLPanelFace::getState()
                 childSetEnabled("button align",FALSE);
                 //mBtnAutoFix->setEnabled ( FALSE );
                 
-                if(LLViewerMedia::hasMedia())
-                {
-                        childSetEnabled("textbox autofix",editable);
-                        childSetEnabled("button align",editable);
-                }
                 //if ( LLMediaEngine::getInstance()->getMediaRenderer () )
                 //      if ( LLMediaEngine::getInstance()->getMediaRenderer ()->isLoaded () )
                 //      {       
@@ -568,7 +561,15 @@ void LLPanelFace::getState()
                                         }
                                 }
                         }
+
+                        if(LLViewerMedia::textureHasMedia(id))
+                        {
+                                childSetEnabled("textbox autofix",editable);
+                                childSetEnabled("button align",editable);
+                        }
+
                 }
+
                 
                 LLAggregatePermissions texture_perms;
                 if(texture_ctrl)
@@ -1117,14 +1118,18 @@ struct LLPanelFaceSetMediaFunctor : public LLSelectedTEFunctor
 {
         virtual bool apply(LLViewerObject* object, S32 te)
         {
+                // TODO: the media impl pointer should actually be stored by the texture
+                viewer_media_t pMediaImpl = LLViewerMedia::getMediaImplFromTextureID(object->getTE ( te )->getID());
                 // only do this if it's a media texture
-                if ( object->getTE ( te )->getID() == LLViewerMedia::getMediaTextureID() )
+                if ( pMediaImpl.notNull())
                 {
-                        S32 media_width, media_height;
-                        S32 texture_width, texture_height;
-                        if ( LLViewerMedia::getMediaSize( &media_width, &media_height )
-                                && LLViewerMedia::getTextureSize( &texture_width, &texture_height ) )
+                        LLPluginClassMedia *media = pMediaImpl->getMediaPlugin();
+                        if(media)
                         {
+                                S32 media_width = media->getWidth();
+                                S32 media_height = media->getHeight();
+                                S32 texture_width = media->getTextureWidth();
+                                S32 texture_height = media->getTextureHeight();
                                 F32 scale_s = (F32)media_width / (F32)texture_width;
                                 F32 scale_t = (F32)media_height / (F32)texture_height;
 
diff --git a/linden/indra/newview/llpanellandaudio.cpp b/linden/indra/newview/llpanellandaudio.cpp
new file mode 100644
index 0000000..0247009
--- /dev/null
+++ b/linden/indra/newview/llpanellandaudio.cpp
@@ -0,0 +1,195 @@
+/**
+ * @file llpanellandaudio.cpp
+ * @brief Allows configuration of "media" for a land parcel,
+ *   for example movies, web pages, and audio.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanellandaudio.h"
+
+// viewer includes
+#include "llmimetypes.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+#include "lluictrlfactory.h"
+
+// library includes
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "llfloaterurlentry.h"
+#include "llfocusmgr.h"
+#include "lllineeditor.h"
+#include "llparcel.h"
+#include "lltextbox.h"
+#include "llradiogroup.h"
+#include "llspinctrl.h"
+#include "llsdutil.h"
+#include "lltexturectrl.h"
+#include "roles_constants.h"
+#include "llscrolllistctrl.h"
+
+// Values for the parcel voice settings radio group
+enum
+{
+        kRadioVoiceChatEstate = 0,
+        kRadioVoiceChatPrivate = 1,
+        kRadioVoiceChatDisable = 2
+};
+
+//---------------------------------------------------------------------------
+// LLPanelLandAudio
+//---------------------------------------------------------------------------
+
+LLPanelLandAudio::LLPanelLandAudio(LLParcelSelectionHandle& parcel)
+:       LLPanel(std::string("land_media_panel")), mParcel(parcel)
+{
+}
+
+
+// virtual
+LLPanelLandAudio::~LLPanelLandAudio()
+{
+}
+
+
+BOOL LLPanelLandAudio::postBuild()
+{
+        mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check_sound_local");
+        childSetCommitCallback("check_sound_local", onCommitAny, this);
+
+        mRadioVoiceChat = getChild<LLRadioGroup>("parcel_voice_channel");
+        childSetCommitCallback("parcel_voice_channel", onCommitAny, this);
+
+        mMusicURLEdit = getChild<LLLineEditor>("music_url");
+        childSetCommitCallback("music_url", onCommitAny, this);
+
+        mMusicUrlCheck = getChild<LLCheckBoxCtrl>("hide_music_url");
+        childSetCommitCallback("hide_music_url", onCommitAny, this);
+
+        return TRUE;
+}
+
+
+// public
+void LLPanelLandAudio::refresh()
+{
+        LLParcel *parcel = mParcel->getParcel();
+
+        if (!parcel)
+        {
+                clearCtrls();
+        }
+        else
+        {
+                // something selected, hooray!
+
+                // Display options
+                BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
+
+                mMusicURLEdit->setText(parcel->getMusicURL());
+                mMusicURLEdit->setEnabled( can_change_media );
+
+                mMusicUrlCheck->set( parcel->getObscureMusic() );
+                mMusicUrlCheck->setEnabled( can_change_media );
+
+                mCheckSoundLocal->set( parcel->getSoundLocal() );
+                mCheckSoundLocal->setEnabled( can_change_media );
+
+                if(parcel->getParcelFlagAllowVoice())
+                {
+                        if(parcel->getParcelFlagUseEstateVoiceChannel())
+                                mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatEstate);
+                        else
+                                mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatPrivate);
+                }
+                else
+                {
+                        mRadioVoiceChat->setSelectedIndex(kRadioVoiceChatDisable);
+                }
+
+                LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
+                mRadioVoiceChat->setEnabled( region && region->isVoiceEnabled() && can_change_media );
+        }
+}
+// static
+void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
+{
+        LLPanelLandAudio *self = (LLPanelLandAudio *)userdata;
+
+        LLParcel* parcel = self->mParcel->getParcel();
+        if (!parcel)
+        {
+                return;
+        }
+
+        // Extract data from UI
+        BOOL sound_local                = self->mCheckSoundLocal->get();
+        int voice_setting               = self->mRadioVoiceChat->getSelectedIndex();
+        std::string music_url   = self->mMusicURLEdit->getText();
+        U8 obscure_music                = self->mMusicUrlCheck->get();
+
+
+        BOOL voice_enabled;
+        BOOL voice_estate_chan;
+
+        switch(voice_setting)
+        {
+                default:
+                case kRadioVoiceChatEstate:
+                        voice_enabled = TRUE;
+                        voice_estate_chan = TRUE;
+                break;
+                case kRadioVoiceChatPrivate:
+                        voice_enabled = TRUE;
+                        voice_estate_chan = FALSE;
+                break;
+                case kRadioVoiceChatDisable:
+                        voice_enabled = FALSE;
+                        voice_estate_chan = FALSE;
+                break;
+        }
+
+        // Remove leading/trailing whitespace (common when copying/pasting)
+        LLStringUtil::trim(music_url);
+
+        // Push data into current parcel
+        parcel->setParcelFlag(PF_ALLOW_VOICE_CHAT, voice_enabled);
+        parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
+        parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
+        parcel->setMusicURL(music_url);
+        parcel->setObscureMusic(obscure_music);
+
+        // Send current parcel data upstream to server
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
+
+        // Might have changed properties, so let's redraw!
+        self->refresh();
+}
diff --git a/linden/indra/newview/llpanellandaudio.h b/linden/indra/newview/llpanellandaudio.h
new file mode 100644
index 0000000..3d5d633
--- /dev/null
+++ b/linden/indra/newview/llpanellandaudio.h
@@ -0,0 +1,63 @@
+/**
+ * @file llpanellandaudio.h
+ * @brief Allows configuration of "audio" for a land parcel.
+ *   
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLPANELLANDAUDIO_H
+#define LLPANELLANDAUDIO_H
+
+#include "lllineeditor.h"
+#include "llpanel.h"
+#include "llparcelselection.h"
+#include "lluifwd.h"    // widget pointer types
+
+class LLPanelLandAudio
+        :       public LLPanel
+{
+public:
+        LLPanelLandAudio(LLSafeHandle<LLParcelSelection>& parcelp);
+        /*virtual*/ ~LLPanelLandAudio();
+        /*virtual*/ BOOL postBuild();
+        void refresh();
+
+private:
+        static void onCommitAny(LLUICtrl* ctrl, void *userdata);
+
+private:
+        LLCheckBoxCtrl* mCheckSoundLocal;
+        LLRadioGroup*   mRadioVoiceChat;
+        LLLineEditor*   mMusicURLEdit;
+        LLCheckBoxCtrl* mMusicUrlCheck;
+
+        LLSafeHandle<LLParcelSelection>&        mParcel;
+};
+
+#endif
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index bebd69e..a8e7c4a 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -39,6 +39,8 @@
 #include "llmimetypes.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
+#include "llviewermedia.h"
+#include "llviewerparcelmedia.h"
 #include "lluictrlfactory.h"
 
 // library includes
@@ -54,6 +56,7 @@
 #include "llsdutil.h"
 #include "lltexturectrl.h"
 #include "roles_constants.h"
+#include "llscrolllistctrl.h"
 
 #include "hippoGridManager.h"
 
@@ -62,15 +65,8 @@
 //---------------------------------------------------------------------------
 
 LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
-:       LLPanel(std::string("land_media_panel")),
-
+:       LLPanel(),
         mParcel(parcel),
-        mCheckSoundLocal(NULL),
-        mSoundHelpButton(NULL),
-        mCheckEnableVoiceChat(NULL),
-        mCheckEnableVoiceChatIsEstateDisabled(NULL),
-        mCheckEnableVoiceChatParcel(NULL),
-        mMusicURLEdit(NULL),
         mMediaURLEdit(NULL),
         mMediaDescEdit(NULL),
         mMediaTypeCombo(NULL),
@@ -81,8 +77,7 @@ LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
         mMediaTextureCtrl(NULL),
         mMediaAutoScaleCheck(NULL),
         mMediaLoopCheck(NULL),
-        mMediaUrlCheck(NULL),
-        mMusicUrlCheck(NULL)
+        mMediaUrlCheck(NULL)
 {
 }
 
@@ -90,34 +85,10 @@ LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
 // virtual
 LLPanelLandMedia::~LLPanelLandMedia()
 {
-        // close LLFloaterURLEntry?
-}
-
-
-// static
-void LLPanelLandMedia::onClickSoundHelp(void*)
-{
-        LLNotifications::instance().add("ClickSoundHelpLand");
 }
 
-
 BOOL LLPanelLandMedia::postBuild()
 {
-        mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");
-        childSetCommitCallback("check sound local", onCommitAny, this);
-
-        mSoundHelpButton = getChild<LLButton>("?");
-        mSoundHelpButton->setClickedCallback(onClickSoundHelp, this);
-
-        mCheckEnableVoiceChat = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel");
-        childSetCommitCallback("parcel_enable_voice_channel", onCommitAny, this);
-        mCheckEnableVoiceChatIsEstateDisabled = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_is_estate_disabled");
-        childSetCommitCallback("parcel_enable_voice_channel_is_estate_disabled", onCommitAny, this);
-        mCheckEnableVoiceChatParcel = getChild<LLCheckBoxCtrl>("parcel_enable_voice_channel_parcel");
-        childSetCommitCallback("parcel_enable_voice_channel_parcel", onCommitAny, this);
-
-        mMusicURLEdit = getChild<LLLineEditor>("music_url");
-        childSetCommitCallback("music_url", onCommitAny, this);
 
         mMediaTextureCtrl = getChild<LLTextureCtrl>("media texture");
         mMediaTextureCtrl->setCommitCallback( onCommitAny );
@@ -130,16 +101,13 @@ BOOL LLPanelLandMedia::postBuild()
         childSetCommitCallback("media_auto_scale", onCommitAny, this);
 
         mMediaLoopCheck = getChild<LLCheckBoxCtrl>("media_loop");
-        childSetCommitCallback("media_loop", onCommitAny, this);
+        childSetCommitCallback("media_loop", onCommitAny, this );
 
         mMediaUrlCheck = getChild<LLCheckBoxCtrl>("hide_media_url");
-        childSetCommitCallback("hide_media_url", onCommitAny, this);
-
-        mMusicUrlCheck = getChild<LLCheckBoxCtrl>("hide_music_url");
-        childSetCommitCallback("hide_music_url", onCommitAny, this);
+        childSetCommitCallback("hide_media_url", onCommitAny, this );
 
         mMediaURLEdit = getChild<LLLineEditor>("media_url");
-        childSetCommitCallback("media_url", onCommitAny, this);
+        childSetCommitCallback("media_url", onCommitAny, this );
 
         mMediaDescEdit = getChild<LLLineEditor>("url_description");
         childSetCommitCallback("url_description", onCommitAny, this);
@@ -148,15 +116,41 @@ BOOL LLPanelLandMedia::postBuild()
         childSetCommitCallback("media type", onCommitType, this);
         populateMIMECombo();
 
+        mMediaResetCtrl = getChild<LLSpinCtrl>("media_reset_time");
+        childSetCommitCallback("media_reset_time", onCommitAny, this);
+        mMediaResetCtrlLabel = getChild<LLTextBox>("media_reset");
+
         mMediaWidthCtrl = getChild<LLSpinCtrl>("media_size_width");
         childSetCommitCallback("media_size_width", onCommitAny, this);
         mMediaHeightCtrl = getChild<LLSpinCtrl>("media_size_height");
         childSetCommitCallback("media_size_height", onCommitAny, this);
         mMediaSizeCtrlLabel = getChild<LLTextBox>("media_size");
 
+    mMediaNavigateAllowCheck = getChild<LLCheckBoxCtrl>("check navigate allow");
+        childSetCommitCallback("check navigate allow", onCommitAny, this);
+        mMediaURLFilterCheck = getChild<LLCheckBoxCtrl>("check navigate filter");
+        childSetCommitCallback("check navigate filter", onCommitAny, this);
+        
         mSetURLButton = getChild<LLButton>("set_media_url");
         childSetAction("set_media_url", onSetBtn, this);
 
+        mResetURLButton = getChild<LLButton>("reset_media_url");
+        childSetAction("reset_media_url", onResetBtn, this);
+
+        mURLFilterList = getChild<LLScrollListCtrl>("filter_list");
+
+        mMediaURLFilterDomainEdit = getChild<LLLineEditor>("navigate_filter_domain");
+
+        mMediaURLFilterAddButton = getChild<LLButton>("add_navigate_filter");
+        childSetAction("add_navigate_filter", onClickAddURLFilter, this);
+
+        mMediaURLFilterRemoveButton = getChild<LLButton>("remove_navigate_filter");
+        childSetAction("remove_navigate_filter", onClickRemoveURLFilter, this);
+
+        mRadioNavigateControl = getChild<LLRadioGroup>("radio_navigate_allow");
+        childSetCommitCallback("radio_navigate_allow", onCommitAny, this);
+
+        
         return TRUE;
 }
 
@@ -177,8 +171,8 @@ void LLPanelLandMedia::refresh()
                 // Display options
                 BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
 
-                mCheckSoundLocal->set( parcel->getSoundLocal() );
-                mCheckSoundLocal->setEnabled( can_change_media );
+//imprudence fixme              mCheckSoundLocal->set( parcel->getSoundLocal() );
+//imprudence fixme              mCheckSoundLocal->setEnabled( can_change_media );
 
                 LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
                 if (!region)
@@ -194,42 +188,43 @@ void LLPanelLandMedia::refresh()
                 {
                         if (region && region->isVoiceEnabled()) // estate-wide voice-disable overrides all
                         {
-                                mCheckEnableVoiceChatIsEstateDisabled->setVisible(false);
+//imprudence fixme                              mCheckEnableVoiceChatIsEstateDisabled->setVisible(false);
 
-                                mCheckEnableVoiceChat->setVisible(true);
-                                mCheckEnableVoiceChat->setEnabled( can_change_media );
-                                mCheckEnableVoiceChat->set(allow_voice);
+//imprudence fixme                              mCheckEnableVoiceChat->setVisible(true);
+//imprudence fixme                              mCheckEnableVoiceChat->setEnabled( can_change_media );
+//imprudence fixme                              mCheckEnableVoiceChat->set(allow_voice);
 
-                                mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
+//imprudence fixme                              mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
                         }
                         else // disabled at region level
                         {
-                                mCheckEnableVoiceChatIsEstateDisabled->setVisible(true); // always disabled
-                                mCheckEnableVoiceChat->setVisible(false);
-                                mCheckEnableVoiceChat->setEnabled(false);
-                                mCheckEnableVoiceChat->set(false);
+//imprudence fixme                              mCheckEnableVoiceChatIsEstateDisabled->setVisible(true); // always disabled
+//imprudence fixme                              mCheckEnableVoiceChat->setVisible(false);
+//imprudence fixme                              mCheckEnableVoiceChat->setEnabled(false);
+//imprudence fixme                              mCheckEnableVoiceChat->set(false);
 
-                                mCheckEnableVoiceChatParcel->setEnabled(false);
+//imprudence fixme                              mCheckEnableVoiceChatParcel->setEnabled(false);
                         }
                 }
                 else
                 {
-                        mCheckEnableVoiceChatIsEstateDisabled->setVisible(true);
+//imprudence fixme                      mCheckEnableVoiceChatIsEstateDisabled->setVisible(true);
 
-                        mCheckEnableVoiceChat->setVisible(true);
-                        mCheckEnableVoiceChat->setEnabled( can_change_media );
-                        mCheckEnableVoiceChat->set(allow_voice);
+//imprudence fixme                      mCheckEnableVoiceChat->setVisible(true);
+//imprudence fixme                      mCheckEnableVoiceChat->setEnabled( can_change_media );
+//imprudence fixme                      mCheckEnableVoiceChat->set(allow_voice);
 
-                        mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
+//imprudence fixme                      mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
                 }
 
-                mCheckEnableVoiceChatParcel->set(!parcel->getParcelFlagUseEstateVoiceChannel());
+//imprudence fixme              mCheckEnableVoiceChatParcel->set(!parcel->getParcelFlagUseEstateVoiceChannel());
+
+//imprudence fixme              mMusicURLEdit->setText(parcel->getMusicURL());
+//imprudence fixme              mMusicURLEdit->setEnabled( can_change_media );
+
 
-                mMusicURLEdit->setText(parcel->getMusicURL());
-                mMusicURLEdit->setEnabled( can_change_media );
 
-                mMediaURLEdit->setText(parcel->getMediaURL());
-                mMediaURLEdit->setEnabled( FALSE );
+                childSetText("current_url", parcel->getMediaCurrentURL());
 
                 mMediaDescEdit->setText(parcel->getMediaDesc());
                 mMediaDescEdit->setEnabled( can_change_media );
@@ -246,15 +241,11 @@ void LLPanelLandMedia::refresh()
                 mMediaUrlCheck->set( parcel->getObscureMedia() );
                 mMediaUrlCheck->setEnabled( can_change_media );
 
-                mMusicUrlCheck->set( parcel->getObscureMusic() );
-                mMusicUrlCheck->setEnabled( can_change_media );
-
                 // don't display urls if you're not able to change it
                 // much requested change in forums so people can't 'steal' urls
                 // NOTE: bug#2009 means this is still vunerable - however, bug
                 // should be closed since this bug opens up major security issues elsewhere.
                 bool obscure_media = ! can_change_media && parcel->getObscureMedia();
-                bool obscure_music = ! can_change_media && parcel->getObscureMusic();
 
                 // Special code to disable asterixes for html type
                 if(mime_type == "text/html")
@@ -264,7 +255,6 @@ void LLPanelLandMedia::refresh()
                         mMediaUrlCheck->setEnabled( false );
                 }
 
-                mMusicURLEdit->setDrawAsterixes( obscure_music );
                 mMediaURLEdit->setDrawAsterixes( obscure_media );
 
                 mMediaAutoScaleCheck->set( parcel->getMediaAutoScale () );
@@ -278,6 +268,10 @@ void LLPanelLandMedia::refresh()
                 else
                         mMediaLoopCheck->set( false );
                 mMediaLoopCheck->setEnabled ( can_change_media && allow_looping );
+                
+                mMediaResetCtrl->set( parcel->getMediaURLTimeout() );
+                mMediaResetCtrl->setEnabled( can_change_media );
+                mMediaResetCtrlLabel->setEnabled( can_change_media );
 
                 // disallow media size change for mime types that don't allow it
                 bool allow_resize = LLMIMETypes::findAllowResize( mime_type );
@@ -301,28 +295,45 @@ void LLPanelLandMedia::refresh()
                 mMediaTextureCtrl->setEnabled( can_change_media );
 
                 mSetURLButton->setEnabled( can_change_media );
+                mResetURLButton->setEnabled( can_change_media );
 
-                #if 0
-                // there is a media url and a media texture selected
-                if ( ( ! ( std::string ( parcel->getMediaURL() ).empty () ) ) && ( ! ( parcel->getMediaID ().isNull () ) ) )
-                {
-                        // turn on transport controls if allowed for this parcel
-                        mMediaStopButton->setEnabled ( editable );
-                        mMediaStartButton->setEnabled ( editable );
-                }
-                else
-                {
-                        // no media url or no media texture
-                        mMediaStopButton->setEnabled ( FALSE );
-                        mMediaStartButton->setEnabled ( FALSE );
-                };
-                #endif
+                mMediaURLFilterCheck->set( parcel->getMediaURLFilterEnable() );
+                mMediaURLFilterCheck->setEnabled( can_change_media );
 
                 LLFloaterURLEntry* floater_url_entry = (LLFloaterURLEntry*)mURLEntryFloater.get();
                 if (floater_url_entry)
                 {
                         floater_url_entry->updateFromLandMediaPanel();
                 }
+
+                // This radial control is really just an inverse mapping to the boolean allow_navigate value. 
+                // It is set as a radial merely for user readability.
+                mRadioNavigateControl->setSelectedIndex(! parcel->getMediaAllowNavigate());
+                mRadioNavigateControl->setEnabled( can_change_media );
+
+                mMediaURLFilterDomainEdit->setEnabled( can_change_media );
+                mMediaURLFilterAddButton->setEnabled( can_change_media );
+                mMediaURLFilterRemoveButton->setEnabled( can_change_media );
+
+                if (mURLFilterList)
+                {
+                        mURLFilterList->setEnabled( can_change_media );
+                        
+                        mURLFilterList->deleteAllItems();
+
+                        LLSD list = parcel->getMediaURLFilterList();
+                        
+                        for (LLSD::array_iterator i = list.beginArray(); i != list.endArray(); ++i)
+                        {
+                                std::string domain = (*i).asString();
+
+                                LLSD element;
+                                element["id"] = domain;
+                                element["columns"][0]["value"] = domain;
+                                
+                                mURLFilterList->addElement(element);
+                        }
+                }
         }
 }
 
@@ -364,12 +375,19 @@ void LLPanelLandMedia::setMediaType(const std::string& mime_type)
 void LLPanelLandMedia::setMediaURL(const std::string& media_url)
 {
         mMediaURLEdit->setText(media_url);
+        LLParcel *parcel = mParcel->getParcel();
+        if(parcel)
+                parcel->setMediaCurrentURL(media_url);
+        // LLViewerMedia::navigateHome();
+
+
         mMediaURLEdit->onCommit();
+        // LLViewerParcelMedia::sendMediaNavigateMessage(media_url);
+        childSetText("current_url", media_url);
 }
-
 std::string LLPanelLandMedia::getMediaURL()
 {
-        return mMediaURLEdit->getText();
+        return mMediaURLEdit->getText();        
 }
 
 // static
@@ -398,33 +416,26 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
         }
 
         // Extract data from UI
-        BOOL sound_local                = self->mCheckSoundLocal->get();
-        std::string music_url   = self->mMusicURLEdit->getText();
         std::string media_url   = self->mMediaURLEdit->getText();
         std::string media_desc  = self->mMediaDescEdit->getText();
         std::string mime_type   = self->childGetText("mime_type");
         U8 media_auto_scale             = self->mMediaAutoScaleCheck->get();
         U8 media_loop           = self->mMediaLoopCheck->get();
         U8 obscure_media                = self->mMediaUrlCheck->get();
-        U8 obscure_music                = self->mMusicUrlCheck->get();
+        F32 media_reset_time    = (F32)self->mMediaResetCtrl->get();
         S32 media_width                 = (S32)self->mMediaWidthCtrl->get();
         S32 media_height                = (S32)self->mMediaHeightCtrl->get();
         LLUUID media_id                 = self->mMediaTextureCtrl->getImageAssetID();
+        U8 navigate_allow       = ! self->mRadioNavigateControl->getSelectedIndex();
+        U8 navigate_filter      = self->mMediaURLFilterCheck->get();
 
-        BOOL voice_enabled = self->mCheckEnableVoiceChat->get();
-        BOOL voice_estate_chan = ! self->mCheckEnableVoiceChatParcel->get();
 
         self->childSetText("mime_type", mime_type);
 
         // Remove leading/trailing whitespace (common when copying/pasting)
-        LLStringUtil::trim(music_url);
         LLStringUtil::trim(media_url);
 
         // Push data into current parcel
-        parcel->setParcelFlag(PF_ALLOW_VOICE_CHAT, voice_enabled);
-        parcel->setParcelFlag(PF_USE_ESTATE_VOICE_CHAN, voice_estate_chan);
-        parcel->setParcelFlag(PF_SOUND_LOCAL, sound_local);
-        parcel->setMusicURL(music_url);
         parcel->setMediaURL(media_url);
         parcel->setMediaType(mime_type);
         parcel->setMediaDesc(media_desc);
@@ -434,7 +445,10 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
         parcel->setMediaAutoScale ( media_auto_scale );
         parcel->setMediaLoop ( media_loop );
         parcel->setObscureMedia( obscure_media );
-        parcel->setObscureMusic( obscure_music );
+        parcel->setMediaURLFilterEnable(navigate_filter);
+        parcel->setMediaAllowNavigate(navigate_allow);
+        parcel->setMediaURLTimeout(media_reset_time);
+
 
         // Send current parcel data upstream to server
         LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
@@ -453,3 +467,91 @@ void LLPanelLandMedia::onSetBtn(void *userdata)
                 parent_floater->addDependentFloater(self->mURLEntryFloater.get());
         }
 }
+
+// static
+void LLPanelLandMedia::onResetBtn(void *userdata)
+{
+        LLPanelLandMedia *self = (LLPanelLandMedia *)userdata;
+        LLParcel* parcel = self->mParcel->getParcel();
+        // LLViewerMedia::navigateHome();
+        self->refresh();
+        self->childSetText("current_url", parcel->getMediaURL());
+        // LLViewerParcelMedia::sendMediaNavigateMessage(parcel->getMediaURL());
+
+}
+// static
+void LLPanelLandMedia::onClickAddURLFilter(void *userdata)
+{
+        LLPanelLandMedia *panelp = (LLPanelLandMedia *)userdata;
+        LLParcel* parcel = panelp->mParcel->getParcel();
+        
+        LLSD list = parcel->getMediaURLFilterList();
+
+        std::string domain = panelp->mMediaURLFilterDomainEdit->getText();
+        LLStringUtil::trim(domain);
+
+        BOOL add = TRUE;
+        if (domain == "")
+        {
+                add = FALSE;
+        }
+
+        // check for dupes
+        for(S32 i = 0; i < list.size(); i++)
+        {
+                if (list[i].asString() == domain)
+                {
+                        add = FALSE;
+                        break;
+                }
+        }
+
+        if (add)
+        {
+                list.append(domain);
+                parcel->setMediaURLFilterList(list);
+
+                LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
+
+                panelp->mMediaURLFilterDomainEdit->setText(std::string(""));
+
+                panelp->refresh();
+        }
+
+}
+
+// static
+void LLPanelLandMedia::onClickRemoveURLFilter(void *data)
+{
+        LLPanelLandMedia* panelp = (LLPanelLandMedia*)data;
+        if (panelp && panelp->mURLFilterList)
+        {
+                LLParcel* parcel = panelp->mParcel->getParcel();
+                if (parcel)
+                {
+                        LLSD list = parcel->getMediaURLFilterList();
+                        
+                        std::vector<LLScrollListItem*> domains = panelp->mURLFilterList->getAllSelected();
+                        for (std::vector<LLScrollListItem*>::iterator iter = domains.begin(); iter != domains.end(); iter++)
+                        {
+                                LLScrollListItem* item = *iter;
+                                const std::string domain = item->getValue().asString();
+
+                                for(S32 i = 0; i < list.size(); i++)
+                                {
+                                        if (list[i].asString() == domain)
+                                        {
+                                                list.erase(i);
+                                                break;
+                                        }
+                                }
+                        }
+                        
+                        parcel->setMediaURLFilterList(list);
+                        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
+
+                        panelp->refresh();
+                }
+        }
+        
+}
diff --git a/linden/indra/newview/llpanellandmedia.h b/linden/indra/newview/llpanellandmedia.h
index 6a53dd4..c883d98 100644
--- a/linden/indra/newview/llpanellandmedia.h
+++ b/linden/indra/newview/llpanellandmedia.h
@@ -56,29 +56,36 @@ private:
         static void onCommitAny(LLUICtrl* ctrl, void *userdata);
         static void onCommitType(LLUICtrl* ctrl, void *userdata);
         static void onSetBtn(void* userdata);
-        static void onClickSoundHelp(void*);
-
+        static void onResetBtn(void* userdata);
+        static void onClickAddURLFilter(void *userdata);
+        static void onClickRemoveURLFilter(void *userdata);
+        
 private:
-        LLCheckBoxCtrl* mCheckSoundLocal;
-        LLButton*       mSoundHelpButton;
-        LLCheckBoxCtrl* mCheckEnableVoiceChat;
-        LLCheckBoxCtrl* mCheckEnableVoiceChatIsEstateDisabled;
-        LLCheckBoxCtrl* mCheckEnableVoiceChatParcel;
-        LLLineEditor*   mMusicURLEdit;
         LLLineEditor*   mMediaURLEdit;
         LLLineEditor*   mMediaDescEdit;
         LLComboBox*             mMediaTypeCombo;
         LLButton*               mSetURLButton;
+        LLButton*               mResetURLButton;
+        LLSpinCtrl*             mMediaResetCtrl;
         LLSpinCtrl*             mMediaHeightCtrl;
         LLSpinCtrl*             mMediaWidthCtrl;
+        LLTextBox*              mMediaResetCtrlLabel;
         LLTextBox*              mMediaSizeCtrlLabel;
         LLTextureCtrl*  mMediaTextureCtrl;
         LLCheckBoxCtrl* mMediaAutoScaleCheck;
         LLCheckBoxCtrl* mMediaLoopCheck;
         LLCheckBoxCtrl* mMediaUrlCheck;
-        LLCheckBoxCtrl* mMusicUrlCheck;
         LLHandle<LLFloater>     mURLEntryFloater;
+        LLCheckBoxCtrl* mMediaNavigateAllowCheck;
+        LLCheckBoxCtrl* mMediaURLFilterCheck;
+        LLLineEditor*   mMediaURLFilterDomainEdit;
+        LLButton*               mMediaURLFilterAddButton;
+        LLButton*               mMediaURLFilterRemoveButton;
+        LLScrollListCtrl*   mURLFilterList;
+        LLRadioGroup*   mRadioNavigateControl;
+
 
+        
         LLSafeHandle<LLParcelSelection>&        mParcel;
 };
 
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 23b7785..a8b7106 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -73,12 +73,10 @@
 #include "lluictrlfactory.h"
 #include "llhttpclient.h"
 #include "llweb.h"
-#include "llwebbrowserctrl.h"
 #include "viewerversion.h"
+#include "llmediactrl.h"
 
-#include "llfloaterhtml.h"
-
-#include "llfloaterhtmlhelp.h"
+#include "llfloatermediabrowser.h"
 #include "llfloatertos.h"
 
 #include "llglheaders.h"
@@ -101,7 +99,7 @@ class LLLoginRefreshHandler : public LLCommandHandler
 public:
         // don't allow from external browsers
         LLLoginRefreshHandler() : LLCommandHandler("login_refresh", true) { }
-        bool handle(const LLSD& tokens, const LLSD& query_map, LLWebBrowserCtrl* web)
+        bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web)
         {       
                 if (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP)
                 {
@@ -291,16 +289,15 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 #endif    
         
         // get the web browser control
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("login_html");
+        LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("login_html");
+        web_browser->addObserver(this);
+
         // Need to handle login secondlife:///app/ URLs
         web_browser->setTrusted( true );
 
-        // observe browser events
-        web_browser->addObserver( this );
-
         // don't make it a tab stop until SL-27594 is fixed
         web_browser->setTabStop(FALSE);
-        web_browser->navigateToLocalPage( "loading", "loading.html" );
+        // web_browser->navigateToLocalPage( "loading", "loading.html" );
 
         // make links open in external browser
         web_browser->setOpenInExternalBrowser( true );
@@ -335,7 +332,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 void LLPanelLogin::setSiteIsAlive( bool alive )
 {
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("login_html");
+        LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("login_html");
         // if the contents of the site was retrieved
         if ( alive )
         {
@@ -398,6 +395,11 @@ LLPanelLogin::~LLPanelLogin()
 
         //// We know we're done with the image, so be rid of it.
         //gImageList.deleteImage( mLogoImage );
+        
+        if ( gFocusMgr.getDefaultKeyboardFocus() == this )
+        {
+                gFocusMgr.setDefaultKeyboardFocus(NULL);
+        }
 }
 
 // virtual
@@ -779,7 +781,7 @@ void LLPanelLogin::setAlwaysRefresh(bool refresh)
 {
         if (LLStartUp::getStartupState() >= STATE_LOGIN_CLEANUP) return;
 
-        LLWebBrowserCtrl* web_browser = sInstance->getChild<LLWebBrowserCtrl>("login_html");
+        LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html");
 
         if (web_browser)
         {
@@ -952,25 +954,28 @@ void LLPanelLogin::loadLoginPage()
 #endif
 #endif
         
-        LLWebBrowserCtrl* web_browser = sInstance->getChild<LLWebBrowserCtrl>("login_html");
+        LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html");
         
         // navigate to the "real" page 
-        web_browser->navigateTo( oStr.str() );
+        web_browser->navigateTo( oStr.str(), "text/html" );
 }
 
-void LLPanelLogin::onNavigateComplete( const EventType& eventIn )
+void LLPanelLogin::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event)
 {
-        LLWebBrowserCtrl* web_browser = sInstance->getChild<LLWebBrowserCtrl>("login_html");
-        if (web_browser)
+        if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)
         {
-                // *HACK HACK HACK HACK!
-                /* Stuff a Tab key into the browser now so that the first field will
-                ** get the focus!  The embedded javascript on the page that properly
-                ** sets the initial focus in a real web browser is not working inside
-                ** the viewer, so this is an UGLY HACK WORKAROUND for now.
-                */
-                // Commented out as it's not reliable
-                //web_browser->handleKey(KEY_TAB, MASK_NONE, false);
+                LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html");
+                if (web_browser)
+                {
+                        // *HACK HACK HACK HACK!
+                        /* Stuff a Tab key into the browser now so that the first field will
+                        ** get the focus!  The embedded javascript on the page that properly
+                        ** sets the initial focus in a real web browser is not working inside
+                        ** the viewer, so this is an UGLY HACK WORKAROUND for now.
+                        */
+                        // Commented out as it's not reliable
+                        //web_browser->handleKey(KEY_TAB, MASK_NONE, false);
+                }
         }
 }
 
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 15c2d28..c99fa30 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -35,14 +35,14 @@
 
 #include "llpanel.h"
 #include "llmemory.h"                   // LLPointer<>
-#include "llwebbrowserctrl.h"   // LLWebBrowserCtrlObserver
+#include "llmediactrl.h"        // LLMediaCtrlObserver
 
 class LLUIImage;
 
 
 class LLPanelLogin:     
         public LLPanel,
-        public LLWebBrowserCtrlObserver
+        public LLViewerMediaObserver
 {
         LOG_CLASS(LLPanelLogin);
 public:
@@ -84,6 +84,9 @@ public:
         static void setAlwaysRefresh(bool refresh); 
         static void mungePassword(LLUICtrl* caller, void* user_data);
         
+        // inherited from LLViewerMediaObserver
+        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+
 private:
         static void onClickConnect(void*);
         static void onClickGrid(void*);
@@ -91,7 +94,6 @@ private:
         static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
         static void onClickQuit(void*);
         static void onClickVersion(void*);
-        virtual void onNavigateComplete( const EventType& eventIn );
         static void onClickForgotPassword(void*);
         static void onPassKey(LLLineEditor* caller, void* user_data);
         static void onSelectServer(LLUICtrl*, void*);
diff --git a/linden/indra/newview/llpanelmediahud.cpp b/linden/indra/newview/llpanelmediahud.cpp
new file mode 100644
index 0000000..39c4b63
--- /dev/null
+++ b/linden/indra/newview/llpanelmediahud.cpp
@@ -0,0 +1,667 @@
+/** 
+ * @file llpanelmsgs.cpp
+ * @brief Message popup preferences panel
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+//LLPanelMediaHUD
+#include "llagent.h"
+#include "llparcel.h"
+#include "llpanel.h"
+#include "llselectmgr.h"
+#include "llrender.h"
+#include "lldrawable.h"
+#include "llviewerwindow.h"
+#include "lluictrlfactory.h"
+#include "llbutton.h"
+#include "llface.h"
+#include "llhudview.h"
+#include "lliconctrl.h"
+#include "lltoolpie.h"
+#include "llviewercamera.h"
+#include "llpanelmediahud.h"
+#include "llpluginclassmedia.h"
+#include "llviewercontrol.h"
+#include "llviewerparcelmgr.h"
+#include "llviewermedia.h"
+#include "llviewermediafocus.h"
+#include "llvovolume.h"
+#include "llweb.h"
+
+glh::matrix4f glh_get_current_modelview();
+glh::matrix4f glh_get_current_projection();
+
+const F32 ZOOM_NEAR_PADDING             = 1.0f;
+const F32 ZOOM_MEDIUM_PADDING   = 1.2f;
+const F32 ZOOM_FAR_PADDING              = 1.5f;
+
+//
+// LLPanelMediaHUD
+//
+
+LLPanelMediaHUD::LLPanelMediaHUD(viewer_media_t media_impl)
+ :      mMediaImpl(media_impl)
+{
+        mMediaFocus = false;
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_media_hud.xml");
+        mMouseMoveTimer.reset();
+        mFadeTimer.stop();
+        mCurrentZoom = ZOOM_NONE;
+        mScrollState = SCROLL_NONE;
+
+        mPanelHandle.bind(this);
+}
+LLPanelMediaHUD::~LLPanelMediaHUD()
+{
+        mMediaImpl = NULL;
+}
+
+BOOL LLPanelMediaHUD::postBuild()
+{
+        LLButton* close_btn = getChild<LLButton>("close");
+        close_btn->setClickedCallback(onClickClose, this);
+
+        LLButton* back_btn = getChild<LLButton>("back");
+        back_btn->setClickedCallback(onClickBack, this);
+
+        LLButton* fwd_btn = getChild<LLButton>("fwd");
+        fwd_btn->setClickedCallback(onClickForward, this);
+
+        LLButton* home_btn = getChild<LLButton>("home");
+        home_btn->setClickedCallback(onClickHome, this);
+
+        LLButton* stop_btn = getChild<LLButton>("stop");
+        stop_btn->setClickedCallback(onClickStop, this);
+
+        LLButton* media_stop_btn = getChild<LLButton>("media_stop");
+        media_stop_btn->setClickedCallback(onClickStop, this);
+
+        LLButton* reload_btn = getChild<LLButton>("reload");
+        reload_btn->setClickedCallback(onClickReload, this);
+
+        LLButton* play_btn = getChild<LLButton>("play");
+        play_btn->setClickedCallback(onClickPlay, this);
+
+        LLButton* pause_btn = getChild<LLButton>("pause");
+        pause_btn->setClickedCallback(onClickPause, this);
+
+        LLButton* open_btn = getChild<LLButton>("new_window");
+        open_btn->setClickedCallback(onClickOpen, this);
+
+        LLButton* zoom_btn = getChild<LLButton>("zoom_frame");
+        zoom_btn->setClickedCallback(onClickZoom, this);
+
+        LLButton* open_btn_h = getChild<LLButton>("new_window_hover");
+        open_btn_h->setClickedCallback(onClickOpen, this);
+
+        LLButton* zoom_btn_h = getChild<LLButton>("zoom_frame_hover");
+        zoom_btn_h->setClickedCallback(onClickZoom, this);
+
+        LLButton* scroll_up_btn = getChild<LLButton>("scrollup");
+        scroll_up_btn->setClickedCallback(onScrollUp, this);
+        scroll_up_btn->setHeldDownCallback(onScrollUpHeld);
+        scroll_up_btn->setMouseUpCallback(onScrollStop);
+        LLButton* scroll_left_btn = getChild<LLButton>("scrollleft");
+        scroll_left_btn->setClickedCallback(onScrollLeft, this);
+        scroll_left_btn->setHeldDownCallback(onScrollLeftHeld);
+        scroll_left_btn->setMouseUpCallback(onScrollStop);
+        LLButton* scroll_right_btn = getChild<LLButton>("scrollright");
+        scroll_right_btn->setClickedCallback(onScrollRight, this);
+        scroll_right_btn->setHeldDownCallback(onScrollLeftHeld);
+        scroll_right_btn->setMouseUpCallback(onScrollStop);
+        LLButton* scroll_down_btn = getChild<LLButton>("scrolldown");
+        scroll_down_btn->setClickedCallback(onScrollDown, this);
+        scroll_down_btn->setHeldDownCallback(onScrollDownHeld);
+        scroll_down_btn->setMouseUpCallback(onScrollStop);
+
+        mMouseInactiveTime = gSavedSettings.getF32("MediaControlTimeout");
+        mControlFadeTime = gSavedSettings.getF32("MediaControlFadeTime");
+
+        mCurrentZoom = ZOOM_NONE;
+        // clicks on HUD buttons do not remove keyboard focus from media
+        setIsChrome(TRUE);
+        return TRUE;
+}
+
+void LLPanelMediaHUD::updateShape()
+{
+        const S32 MIN_HUD_WIDTH=200;
+        const S32 MIN_HUD_HEIGHT=120;
+
+        LLPluginClassMedia* media_plugin = NULL;
+        if(mMediaImpl.notNull() && mMediaImpl->hasMedia())
+        {
+                media_plugin = mMediaImpl->getMediaPlugin();
+        }
+
+        // Early out for no media plugin
+        if(media_plugin == NULL)
+        {
+                setVisible(FALSE);
+                return;
+        }
+
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+
+        bool can_navigate = parcel->getMediaAllowNavigate();
+
+        // LLObjectSelectionHandle selection = LLViewerMediaFocus::getInstance()->getSelection();
+
+        LLSelectNode* nodep = mMediaFocus ? LLSelectMgr::getInstance()->getSelection()->getFirstNode() : LLSelectMgr::getInstance()->getHoverNode();
+        if(! nodep)
+        {
+                return;
+        }
+        setVisible(FALSE);
+        LLViewerObject* objectp = nodep->getObject();
+
+        if (objectp)
+        {
+
+                // Set the state of the buttons
+                LLButton* back_btn = getChild<LLButton>("back");
+                LLButton* fwd_btn = getChild<LLButton>("fwd");
+                LLButton* reload_btn = getChild<LLButton>("reload");
+                LLButton* play_btn = getChild<LLButton>("play");
+                LLButton* pause_btn = getChild<LLButton>("pause");
+                LLButton* stop_btn = getChild<LLButton>("stop");
+                LLButton* media_stop_btn = getChild<LLButton>("media_stop");
+                LLButton* home_btn = getChild<LLButton>("home");
+                LLButton* close_btn = getChild<LLButton>("close");
+                LLButton* open_btn = getChild<LLButton>("new_window");
+                LLPanel* media_focused_panel = getChild<LLPanel>("media_focused_controls");
+                LLPanel* media_hover_panel = getChild<LLPanel>("media_hover_controls");
+                back_btn->setVisible(true);
+                fwd_btn->setVisible(true);
+                reload_btn->setVisible(true);
+                stop_btn->setVisible(false);
+                home_btn->setVisible(true);
+                close_btn->setVisible(true);
+                open_btn->setVisible(true);
+
+
+                if(mMediaFocus)
+                {
+                        back_btn->setEnabled(mMediaImpl->canNavigateBack() && can_navigate);
+                        fwd_btn->setEnabled(mMediaImpl->canNavigateForward() && can_navigate);
+                        stop_btn->setEnabled(can_navigate);
+                        home_btn->setEnabled(can_navigate);
+                        LLPluginClassMediaOwner::EMediaStatus result = media_plugin->getStatus();
+
+                        if(media_plugin->pluginSupportsMediaTime())
+                        {
+                                reload_btn->setEnabled(FALSE);
+                                reload_btn->setVisible(FALSE);
+                                media_stop_btn->setVisible(TRUE);
+                                home_btn->setVisible(FALSE);
+                                back_btn->setEnabled(TRUE);
+                                fwd_btn->setEnabled(TRUE);
+                                switch(result)
+                                {
+                                case LLPluginClassMediaOwner::MEDIA_PLAYING:
+                                        play_btn->setEnabled(FALSE);
+                                        play_btn->setVisible(FALSE);
+                                        pause_btn->setEnabled(TRUE);
+                                        pause_btn->setVisible(TRUE);
+                                        media_stop_btn->setEnabled(TRUE);
+                                        break;
+                                case LLPluginClassMediaOwner::MEDIA_PAUSED:
+                                default:
+                                        pause_btn->setEnabled(FALSE);
+                                        pause_btn->setVisible(FALSE);
+                                        play_btn->setEnabled(TRUE);
+                                        play_btn->setVisible(TRUE);
+                                        media_stop_btn->setEnabled(FALSE);
+                                        break;
+                                }
+                        }
+                        else
+                        {
+                                play_btn->setVisible(FALSE);
+                                pause_btn->setVisible(FALSE);
+                                media_stop_btn->setVisible(FALSE);
+                                if(result == LLPluginClassMediaOwner::MEDIA_LOADING)
+                                {
+                                        reload_btn->setEnabled(FALSE);
+                                        reload_btn->setVisible(FALSE);
+                                        stop_btn->setEnabled(TRUE);
+                                        stop_btn->setVisible(TRUE);
+                                }
+                                else
+                                {
+                                        reload_btn->setEnabled(TRUE);
+                                        reload_btn->setVisible(TRUE);
+                                        stop_btn->setEnabled(FALSE);
+                                        stop_btn->setVisible(FALSE);
+                                }
+                        }
+                }
+                media_focused_panel->setVisible(mMediaFocus);
+                media_hover_panel->setVisible(!mMediaFocus);
+
+                if(media_plugin == NULL)
+                // Handle Scrolling
+                switch (mScrollState) 
+                {
+                case SCROLL_UP:
+                        media_plugin->scrollEvent(0, -1, MASK_NONE);
+                        break;
+                case SCROLL_DOWN:
+                        media_plugin->scrollEvent(0, 1, MASK_NONE);
+                        break;
+                case SCROLL_LEFT:
+                        mMediaImpl->handleKeyHere(KEY_LEFT, MASK_NONE);
+                        break;
+                case SCROLL_RIGHT:
+                        mMediaImpl->handleKeyHere(KEY_RIGHT, MASK_NONE);
+                        break;
+                case SCROLL_NONE:
+                default:
+                        break;
+                }
+                LLBBox screen_bbox;
+                setVisible(TRUE);
+                glh::matrix4f mat = glh_get_current_projection()*glh_get_current_modelview();
+                std::vector<LLVector3>::iterator vert_it;
+                std::vector<LLVector3>::iterator vert_end;
+                std::vector<LLVector3> vect_face;
+
+                LLVolume* volume = objectp->getVolume();
+
+                if (volume)
+                {
+                        const LLVolumeFace& vf = volume->getVolumeFace(nodep->getLastSelectedTE());
+
+                        const LLVector3* ext = vf.mExtents;
+
+                        LLVector3 center = (ext[0]+ext[1])*0.5f;
+                        LLVector3 size = (ext[1]-ext[0])*0.5f;
+                        LLVector3 vert[] =
+                        {
+                                center + size.scaledVec(LLVector3(1,1,1)),
+                                center + size.scaledVec(LLVector3(-1,1,1)),
+                                center + size.scaledVec(LLVector3(1,-1,1)),
+                                center + size.scaledVec(LLVector3(-1,-1,1)),
+                                center + size.scaledVec(LLVector3(1,1,-1)),
+                                center + size.scaledVec(LLVector3(-1,1,-1)),
+                                center + size.scaledVec(LLVector3(1,-1,-1)),
+                                center + size.scaledVec(LLVector3(-1,-1,-1)),
+                        };
+
+                        LLVOVolume* vo = (LLVOVolume*) objectp;
+
+                        for (U32 i = 0; i < 8; i++)
+                        {
+                                vect_face.push_back(vo->volumePositionToAgent(vert[i]));        
+                        }
+                }
+                vert_it = vect_face.begin();
+                vert_end = vect_face.end();
+
+                LLVector3 min = LLVector3(1,1,1);
+                LLVector3 max = LLVector3(-1,-1,-1);
+                for(; vert_it != vert_end; ++vert_it)
+                {
+                        // project silhouette vertices into screen space
+                        glh::vec3f screen_vert = glh::vec3f(vert_it->mV); 
+                        mat.mult_matrix_vec(screen_vert);
+
+                        // add to screenspace bounding box
+                        update_min_max(min, max, LLVector3(screen_vert.v));
+                }
+
+                LLCoordGL screen_min;
+                screen_min.mX = llround((F32)gViewerWindow->getWindowWidth() * (min.mV[VX] + 1.f) * 0.5f);
+                screen_min.mY = llround((F32)gViewerWindow->getWindowHeight() * (min.mV[VY] + 1.f) * 0.5f);
+
+                LLCoordGL screen_max;
+                screen_max.mX = llround((F32)gViewerWindow->getWindowWidth() * (max.mV[VX] + 1.f) * 0.5f);
+                screen_max.mY = llround((F32)gViewerWindow->getWindowHeight() * (max.mV[VY] + 1.f) * 0.5f);
+
+                // grow panel so that screenspace bounding box fits inside "media_region" element of HUD
+                LLRect media_hud_rect;
+                getParent()->screenRectToLocal(LLRect(screen_min.mX, screen_max.mY, screen_max.mX, screen_min.mY), &media_hud_rect);
+                LLView* media_region = getChild<LLView>("media_region");
+                media_hud_rect.mLeft -= media_region->getRect().mLeft;
+                media_hud_rect.mBottom -= media_region->getRect().mBottom;
+                media_hud_rect.mTop += getRect().getHeight() - media_region->getRect().mTop;
+                media_hud_rect.mRight += getRect().getWidth() - media_region->getRect().mRight;
+
+
+                LLRect old_hud_rect = media_hud_rect;
+                // keep all parts of HUD on-screen
+                media_hud_rect.intersectWith(getParent()->getLocalRect());
+
+                // If we had to clip the rect, don't display the border
+                childSetVisible("bg_image", false);
+
+                // clamp to minimum size, keeping centered
+                media_hud_rect.setCenterAndSize(media_hud_rect.getCenterX(), media_hud_rect.getCenterY(),
+                        llmax(MIN_HUD_WIDTH, media_hud_rect.getWidth()), llmax(MIN_HUD_HEIGHT, media_hud_rect.getHeight()));
+
+                userSetShape(media_hud_rect);
+
+                // Test mouse position to see if the cursor is stationary
+                LLCoordWindow cursor_pos_window;
+                getWindow()->getCursorPosition(&cursor_pos_window);
+
+                // If last pos is not equal to current pos, the mouse has moved
+                // We need to reset the timer, and make sure the panel is visible
+                if(cursor_pos_window.mX != mLastCursorPos.mX ||
+                        cursor_pos_window.mY != mLastCursorPos.mY ||
+                        mScrollState != SCROLL_NONE)
+                {
+                        mMouseMoveTimer.start();
+                        mLastCursorPos = cursor_pos_window;
+                }
+                
+                // Mouse has been stationary, but not for long enough to fade the UI
+                if(mMouseMoveTimer.getElapsedTimeF32() < mMouseInactiveTime)
+                {
+                        // If we have started fading, reset the alpha values
+                        if(mFadeTimer.getStarted())
+                        {
+                                F32 alpha = 1.0f;
+                                setAlpha(alpha);
+                                mFadeTimer.stop();
+                        }
+                }
+                // If we need to start fading the UI (and we have not already started)
+                else if(! mFadeTimer.getStarted())
+                {
+                        mFadeTimer.reset();
+                        mFadeTimer.start();
+                }
+        }
+}
+/*virtual*/
+void LLPanelMediaHUD::draw()
+{
+        if(mFadeTimer.getStarted())
+        {
+                if(mFadeTimer.getElapsedTimeF32() >= mControlFadeTime)
+                {
+                        setVisible(FALSE);
+                }
+                else
+                {
+                        F32 time = mFadeTimer.getElapsedTimeF32();
+                        F32 alpha = llmax(lerp(1.0, 0.0, time / mControlFadeTime), 0.0f);
+                        setAlpha(alpha);
+                }
+        }
+        LLPanel::draw();
+}
+void LLPanelMediaHUD::setAlpha(F32 alpha)
+{
+        LLViewQuery query;
+
+        LLView* query_view = mMediaFocus ? getChildView("media_focused_controls") : getChildView("media_hover_controls");
+        child_list_t children = query(query_view);
+        for (child_list_iter_t child_iter = children.begin();
+                child_iter != children.end(); ++child_iter)
+        {
+                LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(*child_iter);
+                if (ctrl)
+                        ctrl->setAlpha(alpha);
+        }
+
+        LLPanel::setAlpha(alpha);
+}
+BOOL LLPanelMediaHUD::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+}
+bool LLPanelMediaHUD::isMouseOver()
+{
+        if( ! getVisible() )
+        {
+                return false;
+        }
+        LLRect screen_rect;
+        LLCoordWindow cursor_pos_window;
+        getWindow()->getCursorPosition(&cursor_pos_window);
+
+        localRectToScreen(getLocalRect(), &screen_rect);
+        // screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
+
+        if(screen_rect.pointInRect(cursor_pos_window.mX, cursor_pos_window.mY))
+        {
+                return true;
+        }
+        return false;
+}
+
+//static
+void LLPanelMediaHUD::onClickClose(void* user_data)
+{
+        LLViewerMediaFocus::getInstance()->setFocusFace(FALSE, NULL, 0, NULL);
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if(this_panel->mCurrentZoom != ZOOM_NONE)
+        {
+                // gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+                this_panel->mCurrentZoom = ZOOM_NONE;
+        }
+        this_panel->setVisible(FALSE);
+
+}
+
+//static
+void LLPanelMediaHUD::onClickBack(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if (this_panel->mMediaImpl.notNull() && this_panel->mMediaImpl->hasMedia())
+        {
+                if(this_panel->mMediaImpl->getMediaPlugin()->pluginSupportsMediaTime())
+                {
+                        this_panel->mMediaImpl->getMediaPlugin()->start(-2.0);
+                }
+                else
+                {
+                        this_panel->mMediaImpl->getMediaPlugin()->browse_back();
+                }
+
+        }
+}
+//static
+void LLPanelMediaHUD::onClickForward(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if (this_panel->mMediaImpl.notNull() && this_panel->mMediaImpl->hasMedia())
+        {
+                if(this_panel->mMediaImpl->getMediaPlugin()->pluginSupportsMediaTime())
+                {
+                        this_panel->mMediaImpl->getMediaPlugin()->start(2.0);
+                }
+                else
+                {
+                        this_panel->mMediaImpl->getMediaPlugin()->browse_forward();
+                }
+        }
+}
+//static
+void LLPanelMediaHUD::onClickHome(void* user_data)
+{
+        //LLViewerMedia::navigateHome();
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if(this_panel->mMediaImpl.notNull())
+        {
+                this_panel->mMediaImpl->navigateHome();
+        }
+}
+//static
+void LLPanelMediaHUD::onClickOpen(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if(this_panel->mMediaImpl.notNull())
+        {
+                LLWeb::loadURL(this_panel->mMediaImpl->getMediaURL());
+        }       
+}
+//static
+void LLPanelMediaHUD::onClickReload(void* user_data)
+{
+        //LLViewerMedia::navigateHome();
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        if(objectp && this_panel->mMediaImpl.notNull())
+        {
+                this_panel->mMediaImpl->navigateTo(objectp->getMediaURL());
+        }
+}
+//static
+void LLPanelMediaHUD::onClickPlay(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if (this_panel->mMediaImpl.notNull() && this_panel->mMediaImpl->hasMedia())
+        {
+                this_panel->mMediaImpl->getMediaPlugin()->start();
+        }
+}
+//static
+void LLPanelMediaHUD::onClickPause(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if (this_panel->mMediaImpl.notNull() && this_panel->mMediaImpl->hasMedia())
+        {
+                this_panel->mMediaImpl->getMediaPlugin()->pause();
+        }
+}
+//static 
+void LLPanelMediaHUD::onClickStop(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if (this_panel->mMediaImpl.notNull() && this_panel->mMediaImpl->hasMedia())
+        {
+                if(this_panel->mMediaImpl->getMediaPlugin()->pluginSupportsMediaTime())
+                {
+                        this_panel->mMediaImpl->getMediaPlugin()->stop();
+                }
+                else
+                {
+                        this_panel->mMediaImpl->getMediaPlugin()->browse_stop();
+                }
+        }
+}
+//static 
+void LLPanelMediaHUD::onClickZoom(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        this_panel->nextZoomLevel();
+}
+void LLPanelMediaHUD::nextZoomLevel()
+{
+        F32 zoom_padding = 0.0f;
+        S32 last_zoom_level = (S32)mCurrentZoom;
+        mCurrentZoom = (EZoomLevel)((last_zoom_level + 1) % (S32)ZOOM_END);
+
+        switch (mCurrentZoom)
+        {
+        case ZOOM_NONE:
+                {
+                        gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+                        break;
+                }
+        case ZOOM_MEDIUM:
+                {
+                        zoom_padding = ZOOM_MEDIUM_PADDING;
+                        break;
+                }
+        default:
+                {
+                        gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+                        break;
+                }
+        }
+
+        if (zoom_padding > 0.0f)                
+                LLViewerMediaFocus::getInstance()->setCameraZoom(zoom_padding);
+}
+void LLPanelMediaHUD::onScrollUp(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if(this_panel->mMediaImpl.notNull() && this_panel->mMediaImpl->hasMedia())
+        {
+                this_panel->mMediaImpl->getMediaPlugin()->scrollEvent(0, -1, MASK_NONE);
+        }
+}
+void LLPanelMediaHUD::onScrollUpHeld(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        this_panel->mScrollState = SCROLL_UP;
+}
+void LLPanelMediaHUD::onScrollRight(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if(this_panel->mMediaImpl.notNull())
+        {
+                this_panel->mMediaImpl->handleKeyHere(KEY_RIGHT, MASK_NONE);
+        }
+}
+void LLPanelMediaHUD::onScrollRightHeld(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        this_panel->mScrollState = SCROLL_RIGHT;
+}
+
+void LLPanelMediaHUD::onScrollLeft(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if(this_panel->mMediaImpl.notNull())
+        {
+                this_panel->mMediaImpl->handleKeyHere(KEY_LEFT, MASK_NONE);
+        }
+}
+void LLPanelMediaHUD::onScrollLeftHeld(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        this_panel->mScrollState = SCROLL_LEFT;
+}
+
+void LLPanelMediaHUD::onScrollDown(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        if(this_panel->mMediaImpl.notNull() && this_panel->mMediaImpl->hasMedia())
+        {
+                this_panel->mMediaImpl->getMediaPlugin()->scrollEvent(0, 1, MASK_NONE);
+        }
+}
+void LLPanelMediaHUD::onScrollDownHeld(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        this_panel->mScrollState = SCROLL_DOWN;
+}
+
+void LLPanelMediaHUD::onScrollStop(void* user_data)
+{
+        LLPanelMediaHUD* this_panel = static_cast<LLPanelMediaHUD*> (user_data);
+        this_panel->mScrollState = SCROLL_NONE;
+}
diff --git a/linden/indra/newview/llpanelmediahud.h b/linden/indra/newview/llpanelmediahud.h
new file mode 100644
index 0000000..5f12ebc
--- /dev/null
+++ b/linden/indra/newview/llpanelmediahud.h
@@ -0,0 +1,110 @@
+/** 
+ * @file llpanelmediahud.h
+ * @brief Media hud panel
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_PANELMEDIAHUD_H
+#define LL_PANELMEDIAHUD_H
+
+#include "llpanel.h"
+#include "llviewermedia.h"
+
+class LLCoordWindow;
+class LLViewerMediaImpl;
+
+class LLPanelMediaHUD : public LLPanel
+{
+public:
+        LLPanelMediaHUD(viewer_media_t media_impl);
+        virtual ~LLPanelMediaHUD();
+        /*virtual*/ BOOL postBuild();
+        virtual void draw();
+        virtual void setAlpha(F32 alpha);
+        virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+        void updateShape();
+        bool isMouseOver();
+        void setMediaFocus(bool b) { mMediaFocus = b; }
+        void nextZoomLevel();
+        void resetZoomLevel() { mCurrentZoom = ZOOM_NONE; }
+
+        LLHandle<LLPanelMediaHUD>       getHandle() const { return mPanelHandle; }
+        void setMediaImpl(viewer_media_t media_impl) { mMediaImpl = media_impl; }
+
+
+        enum EZoomLevel
+        {
+                ZOOM_NONE = 0,
+                ZOOM_MEDIUM = 1,
+                ZOOM_END
+        };
+        enum EScrollDir
+        {
+                SCROLL_UP = 0,
+                SCROLL_DOWN,
+                SCROLL_LEFT,
+                SCROLL_RIGHT,
+                SCROLL_NONE
+        };
+
+private:
+        static void onClickClose(void* user_data);
+        static void onClickBack(void* user_data);
+        static void onClickForward(void* user_data);
+        static void onClickHome(void* user_data);
+        static void onClickOpen(void* user_data);
+        static void onClickReload(void* user_data);
+        static void onClickPlay(void* user_data);
+        static void onClickPause(void* user_data);
+        static void onClickStop(void* user_data);
+        static void onClickZoom(void* user_data);
+        static void onScrollUp(void* user_data);
+        static void onScrollUpHeld(void* user_data);
+        static void onScrollLeft(void* user_data);
+        static void onScrollLeftHeld(void* user_data);
+        static void onScrollRight(void* user_data);
+        static void onScrollRightHeld(void* user_data);
+        static void onScrollDown(void* user_data);
+        static void onScrollDownHeld(void* user_data);
+        static void onScrollStop(void* user_data);
+
+        bool mMediaFocus;
+        LLMatrix4 mLastCameraMat;
+        EZoomLevel mCurrentZoom;
+        EScrollDir mScrollState;
+        LLCoordWindow mLastCursorPos;
+        LLFrameTimer mMouseMoveTimer;
+        LLFrameTimer mFadeTimer;
+        F32 mMouseInactiveTime;
+        F32 mControlFadeTime;
+        viewer_media_t mMediaImpl;
+        LLRootHandle<LLPanelMediaHUD> mPanelHandle;
+};
+
+#endif // LL_PANELMEDIAHUD_H
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index fc05744..6b318e0 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -277,7 +277,7 @@ void LLPanelPermissions::refresh()
         BOOL is_perm_modify = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
                                                         && LLSelectMgr::getInstance()->selectGetRootsModify()) 
                                                         || LLSelectMgr::getInstance()->selectGetModify();
-        const LLView* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
+        const LLFocusableElement* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
         S32 string_index = 0;
         std::string MODIFY_INFO_STRINGS[] =
         {
diff --git a/linden/indra/newview/llpanelweb.cpp b/linden/indra/newview/llpanelweb.cpp
index 38bb2d7..e2933f0 100644
--- a/linden/indra/newview/llpanelweb.cpp
+++ b/linden/indra/newview/llpanelweb.cpp
@@ -38,50 +38,23 @@
 // project includes
 #include "llcheckboxctrl.h"
 #include "hippoGridManager.h"
-#include "llmediamanager.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
+#include "llviewermedia.h"
 #include "llviewerwindow.h"
+#include "llpluginclassmedia.h"
 
 // helper functions for getting/freeing the web browser media
 // if creating/destroying these is too slow, we'll need to create
 // a static member and update all our static callbacks
-LLMediaBase *get_web_media()
+viewer_media_t get_web_media()
 {
-        LLMediaBase *media_source;
-        LLMediaManager *mgr = LLMediaManager::getInstance();
-        
-        if (!mgr)
-        {
-                llwarns << "cannot get media manager" << llendl;
-                return NULL;
-        }
 
-        media_source = mgr->createSourceFromMimeType("http", "text/html" );
-        if ( !media_source )
-        {
-                llwarns << "media source create failed " << llendl;
-                return NULL;
-        }
+        viewer_media_t media_source = LLViewerMedia::newMediaImpl("", LLUUID::null, 0, 0, 0, 0, "text/html");
 
         return media_source;
 }
 
-void free_web_media(LLMediaBase *media_source)
-{
-        if (!media_source)
-                return;
-        
-        LLMediaManager *mgr = LLMediaManager::getInstance();
-        if (!mgr)
-        {
-                llwarns << "cannot get media manager" << llendl;
-                return;
-        }
-
-        mgr->destroySource(media_source);
-}
-
 LLPanelWeb::LLPanelWeb()
 {
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_web.xml");
@@ -144,17 +117,16 @@ void LLPanelWeb::apply()
         bool value = childGetValue("use_external_browser").asString() == "external" ? true : false;
         gSavedSettings.setBOOL("UseExternalBrowser", value);
         
-        LLMediaBase *media_source = get_web_media();
-        if (media_source)
+        viewer_media_t media_source = get_web_media();
+        if (media_source && media_source->hasMedia())
         {
-                media_source->enableCookies(childGetValue("cookies_enabled"));
+                media_source->getMediaPlugin()->enable_cookies(childGetValue("cookies_enabled"));
 
                 bool proxy_enable = childGetValue("web_proxy_enabled");
                 std::string proxy_address = childGetValue("web_proxy_editor");
                 int proxy_port = childGetValue("web_proxy_port");
-                media_source->enableProxy(proxy_enable, proxy_address, proxy_port);
+                media_source->getMediaPlugin()->proxy_setup(proxy_enable, proxy_address, proxy_port);
         }
-        free_web_media(media_source);
 }
 
 void LLPanelWeb::cancel()
@@ -173,10 +145,9 @@ bool LLPanelWeb::callback_clear_browser_cache(const LLSD& notification, const LL
         S32 option = LLNotification::getSelectedOption(notification, response);
         if ( option == 0 ) // YES
         {
-                LLMediaBase *media_source = get_web_media();
-                if (media_source)
-                        media_source->clearCache();
-                free_web_media(media_source);
+                viewer_media_t media_source = get_web_media();
+                if (media_source && media_source->hasMedia())
+                        media_source->getMediaPlugin()->clear_cache();
         }
         return false;
 }
@@ -193,10 +164,9 @@ bool LLPanelWeb::callback_clear_cookies(const LLSD& notification, const LLSD& re
         S32 option = LLNotification::getSelectedOption(notification, response);
         if ( option == 0 ) // YES
         {
-                LLMediaBase *media_source = get_web_media();
-                if (media_source)
-                        media_source->clearCookies();
-                free_web_media(media_source);
+                viewer_media_t media_source = get_web_media();
+                if (media_source && media_source->hasMedia())
+                        media_source->getMediaPlugin()->clear_cookies();
         }
         return false;
 }
@@ -209,10 +179,9 @@ void LLPanelWeb::onCommitCookies(LLUICtrl* ctrl, void* data)
 
   if (!self || !check) return;
 
-  LLMediaBase *media_source = get_web_media();
-  if (media_source)
-          media_source->enableCookies(check->get());
-  free_web_media(media_source);
+  viewer_media_t media_source = get_web_media();
+                if (media_source && media_source->hasMedia())
+          media_source->getMediaPlugin()->enable_cookies(check->get());
 }
 // static
 void LLPanelWeb::onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data)
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index fe5446b..609d30a 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -153,8 +153,8 @@ void LLPrefsVoice::apply()
         if (enable_voice && !gSavedSettings.getBOOL("VivoxLicenseAccepted"))
         {
                 // This window enables voice chat if license is accepted
-                FloaterVoiceLicense::getInstance()->open();
-                FloaterVoiceLicense::getInstance()->center();
+//imprudence fixme              FloaterVoiceLicense::getInstance()->open();
+//imprudence fixme              FloaterVoiceLicense::getInstance()->center();
         }
         else
         {
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index d8c3aa9..737d712 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -81,7 +81,7 @@
 #include "llviewertexteditor.h"
 #include "llviewerwindow.h"
 #include "lluictrlfactory.h"
-#include "llwebbrowserctrl.h"
+#include "llmediactrl.h"
 #include "lluictrlfactory.h"
 
 #include "llviewercontrol.h"
@@ -360,7 +360,7 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
         // update back and forward buttons
         LLButton* fwd_button = help_floater->getChild<LLButton>("fwd_btn");
         LLButton* back_button = help_floater->getChild<LLButton>("back_btn");
-        LLWebBrowserCtrl* browser = help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+        LLMediaCtrl* browser = help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
         back_button->setEnabled(browser->canNavigateBack());
         fwd_button->setEnabled(browser->canNavigateForward());
 
@@ -419,7 +419,7 @@ void LLScriptEdCore::setHelpPage(const std::string& help_string)
         LLFloater* help_floater = mLiveHelpHandle.get();
         if (!help_floater) return;
         
-        LLWebBrowserCtrl* web_browser = help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+        LLMediaCtrl* web_browser = help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
         if (!web_browser) return;
 
         LLComboBox* history_combo = help_floater->getChild<LLComboBox>("history_combo");
@@ -592,7 +592,7 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
         live_help_floater->childSetAction("back_btn", onClickBack, userdata);
         live_help_floater->childSetAction("fwd_btn", onClickForward, userdata);
 
-        LLWebBrowserCtrl* browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+        LLMediaCtrl* browser = live_help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
         browser->setAlwaysRefresh(TRUE);
 
         LLComboBox* help_combo = live_help_floater->getChild<LLComboBox>("history_combo");
@@ -621,7 +621,7 @@ void LLScriptEdCore::onClickBack(void* userdata)
         LLFloater* live_help_floater = corep->mLiveHelpHandle.get();
         if (live_help_floater)
         {
-                LLWebBrowserCtrl* browserp = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+                LLMediaCtrl* browserp = live_help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
                 if (browserp)
                 {
                         browserp->navigateBack();
@@ -636,7 +636,7 @@ void LLScriptEdCore::onClickForward(void* userdata)
         LLFloater* live_help_floater = corep->mLiveHelpHandle.get();
         if (live_help_floater)
         {
-                LLWebBrowserCtrl* browserp = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+                LLMediaCtrl* browserp = live_help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
                 if (browserp)
                 {
                         browserp->navigateForward();
@@ -678,7 +678,7 @@ void LLScriptEdCore::onHelpComboCommit(LLUICtrl* ctrl, void* userdata)
 
                 corep->addHelpItemToHistory(help_string);
 
-                LLWebBrowserCtrl* web_browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
+                LLMediaCtrl* web_browser = live_help_floater->getChild<LLMediaCtrl>("lsl_guide_html");
                 LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
                 url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
                 url_string.setArg("[LSL_STRING]", help_string);
diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp
index 26d8da5..0dd65ab 100644
--- a/linden/indra/newview/llpreviewsound.cpp
+++ b/linden/indra/newview/llpreviewsound.cpp
@@ -32,7 +32,7 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llagent.h"          // gAgent
 #include "llbutton.h"
 #include "llinventory.h"
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 83abcf4..558d278 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -59,6 +59,7 @@
 #include "llfloaterreporter.h"
 #include "llfloatertools.h"
 #include "llframetimer.h"
+#include "llfocusmgr.h"
 #include "llhudeffecttrail.h"
 #include "llhudmanager.h"
 #include "llinventorymodel.h"
@@ -74,6 +75,8 @@
 #include "llviewercamera.h"
 #include "llviewercontrol.h"
 #include "llviewerimagelist.h"
+#include "llviewermedia.h"
+#include "llviewermediafocus.h"
 #include "llviewermenu.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
@@ -4875,7 +4878,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
         if (mSelectedObjects->getNumNodes())
         {
                 LLUUID inspect_item_id = LLFloaterInspect::getSelectedUUID();
-                
+                LLUUID focus_item_id = LLViewerMediaFocus::getInstance()->getSelectedUUID();
                 for (S32 pass = 0; pass < 2; pass++)
                 {
                         for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
@@ -4889,7 +4892,11 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
                                 {
                                         continue;
                                 }
-                                if(objectp->getID() == inspect_item_id)
+                                if (objectp->getID() == focus_item_id)
+                                {
+                                        node->renderOneSilhouette(gFocusMgr.getFocusColor());
+                                }
+                                else if(objectp->getID() == inspect_item_id)
                                 {
                                         node->renderOneSilhouette(sHighlightInspectColor);
                                 }
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4fd4daa..87d48c8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -40,14 +40,15 @@
 #       include <sys/stat.h>            // mkdir()
 #endif
 
-#include "audioengine.h"
+#include "llviewermedia_streamingaudio.h"
+#include "llaudioengine.h"
 
 #ifdef LL_FMOD
-# include "audioengine_fmod.h"
+# include "llaudioengine_fmod.h"
 #endif
 
 #ifdef LL_OPENAL
-#include "audioengine_openal.h"
+#include "llaudioengine_openal.h"
 #endif
 
 #include "llares.h"
@@ -100,6 +101,7 @@
 #include "llfloatergesture.h"
 #include "llfloaterhud.h"
 #include "llfloaterland.h"
+#include "llfloaterteleporthistory.h"
 #include "llfloatertopobjects.h"
 #include "llfloatertos.h"
 #include "llfloaterworldmap.h"
@@ -191,12 +193,6 @@
 #include "jcfloater_animation_list.h"
 #include "jcfloaterareasearch.h"
 
-#include "llfloaterteleporthistory.h"
-
-#if LL_LIBXUL_ENABLED
-#include "llmozlib.h"
-#endif // LL_LIBXUL_ENABLED
-
 #if LL_WINDOWS
 #include "llwindebug.h"
 #include "lldxhardware.h"
@@ -675,6 +671,16 @@ bool idle_startup()
                                         delete gAudiop;
                                         gAudiop = NULL;
                                 }
+
+                                if (gAudiop)
+                                {
+                                        // if the audio engine hasn't set up its own preferred handler for streaming audio then set up the generic streaming audio implementation which uses media plugins
+                                        if (NULL == gAudiop->getStreamingAudioImpl())
+                                        {
+                                                LL_INFOS("AppInit") << "Using media plugins to render streaming audio" << LL_ENDL;
+                                                gAudiop->setStreamingAudioImpl(new LLStreamingAudio_MediaPlugins());
+                                        }
+                                }
                         }
                 }
                 
@@ -760,7 +766,7 @@ bool idle_startup()
                 std::string msg = LLTrans::getString("LoginInitializingBrowser");
                 set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
                 display_startup();
-                LLViewerMedia::initBrowser();
+                // LLViewerMedia::initBrowser();
 
                 LLStartUp::setStartupState( STATE_LOGIN_SHOW );
                 return FALSE;
@@ -2234,6 +2240,8 @@ bool idle_startup()
                         LLStringUtil::truncate(gWindowTitle, 255);
                         gViewerWindow->getWindow()->setWindowTitle(gWindowTitle);
                 }
+                // Inform simulator of our language preference
+                LLAgentLanguage::update();
 
                 // unpack thin inventory
                 LLUserAuth::options_t options;
@@ -2553,9 +2561,6 @@ bool idle_startup()
                 // JC - 7/20/2002
                 gViewerWindow->sendShapeToSim();
 
-                // Inform simulator of our language preference
-                LLAgentLanguage::update();
-
                 
                 // Ignore stipend information for now.  Money history is on the web site.
                 // if needed, show the L$ history window
@@ -3824,7 +3829,7 @@ void LLStartUp::multimediaInit()
         set_startup_status(0.42f, msg.c_str(), gAgent.mMOTD.c_str());
         display_startup();
 
-        LLViewerMedia::initClass();
+        //LLViewerMedia::initClass();
         LLViewerParcelMedia::initClass();
 }
 
@@ -3833,7 +3838,7 @@ bool LLStartUp::dispatchURL()
         // ok, if we've gotten this far and have a startup URL
         if (!sSLURLCommand.empty())
         {
-                LLWebBrowserCtrl* web = NULL;
+                LLMediaCtrl* web = NULL;
                 const bool trusted_browser = false;
                 LLURLDispatcher::dispatch(sSLURLCommand, web, trusted_browser);
         }
@@ -3851,7 +3856,7 @@ bool LLStartUp::dispatchURL()
                         || (dy*dy > SLOP*SLOP) )
                 {
                         std::string url = LLURLSimString::getURL();
-                        LLWebBrowserCtrl* web = NULL;
+                        LLMediaCtrl* web = NULL;
                         const bool trusted_browser = false;
                         LLURLDispatcher::dispatch(url, web, trusted_browser);
                 }
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 366363b..d08d3da 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -857,7 +857,7 @@ class LLBalanceHandler : public LLCommandHandler
 public:
         // Requires "trusted" browser/URL source
         LLBalanceHandler() : LLCommandHandler("balance", true) { }
-        bool handle(const LLSD& tokens, const LLSD& query_map, LLWebBrowserCtrl* web)
+        bool handle(const LLSD& tokens, const LLSD& query_map, LLMediaCtrl* web)
         {
                 if (tokens.size() == 1
                         && tokens[0].asString() == "request")
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index b6090bc..16e0136 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -766,10 +766,6 @@ void LLToolCompGun::onMouseCaptureLost()
                 return;
         }
         mCur->onMouseCaptureLost();
-
-        // JC - I don't know if this is necessary.  Maybe we could lose capture
-        // if someone ALT-Tab's out when in mouselook.
-        setCurrentTool( (LLTool*) mGun );
 }
 
 void    LLToolCompGun::handleSelect()
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index b24ba25..81ed0ba 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -229,6 +229,7 @@ public:
         virtual void                    onMouseCaptureLost();
         virtual void                    handleSelect();
         virtual void                    handleDeselect();
+        virtual LLTool*                 getOverrideTool(MASK mask) { return NULL; }
 
 protected:
         LLToolGun*                      mGun;
diff --git a/linden/indra/newview/lltoolgun.cpp b/linden/indra/newview/lltoolgun.cpp
index d21fd49..f7af018 100644
--- a/linden/indra/newview/lltoolgun.cpp
+++ b/linden/indra/newview/lltoolgun.cpp
@@ -49,7 +49,8 @@
 #include "lltoolgrab.h"
 
 LLToolGun::LLToolGun( LLToolComposite* composite )
-:       LLTool( std::string("gun"), composite )
+:       LLTool( std::string("gun"), composite ),
+                mIsSelected(FALSE)
 {
 }
 
@@ -58,6 +59,7 @@ void LLToolGun::handleSelect()
         gViewerWindow->hideCursor();
         gViewerWindow->moveCursorToCenter();
         gViewerWindow->mWindow->setMouseClipping(TRUE);
+        mIsSelected = TRUE;
 }
 
 void LLToolGun::handleDeselect()
@@ -65,6 +67,7 @@ void LLToolGun::handleDeselect()
         gViewerWindow->moveCursorToCenter();
         gViewerWindow->showCursor();
         gViewerWindow->mWindow->setMouseClipping(FALSE);
+        mIsSelected = FALSE;
 }
 
 BOOL LLToolGun::handleMouseDown(S32 x, S32 y, MASK mask)
@@ -77,7 +80,7 @@ BOOL LLToolGun::handleMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) 
 {
-        if( gAgent.cameraMouselook() )
+        if( gAgent.cameraMouselook() && mIsSelected )
         {
                 const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f;
 
diff --git a/linden/indra/newview/lltoolgun.h b/linden/indra/newview/lltoolgun.h
index 4e945d7..4644e68 100644
--- a/linden/indra/newview/lltoolgun.h
+++ b/linden/indra/newview/lltoolgun.h
@@ -52,6 +52,8 @@ public:
 
         virtual LLTool* getOverrideTool(MASK mask) { return NULL; }
         virtual BOOL    clipMouseWhenDown()             { return FALSE; }
+private:
+        BOOL mIsSelected;
 };
 
 #endif
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 3a776d1..8204374 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -281,22 +281,20 @@ void LLToolMgr::clearTransientTool()
 }
 
 
-// The "gun tool", used for handling mouselook, captures the mouse and
-// locks it within the window.  When the app loses focus we need to
-// release this locking.
 void LLToolMgr::onAppFocusLost()
 {
-        mSavedTool = mBaseTool;
-        mBaseTool = gToolNull;
+        if (mSelectedTool)
+        {
+                mSelectedTool->handleDeselect();
+        }
         updateToolStatus();
 }
 
 void LLToolMgr::onAppFocusGained()
 {
-        if (mSavedTool)
+        if (mSelectedTool)
         {
-                mBaseTool = mSavedTool;
-                mSavedTool = NULL;
+                mSelectedTool->handleSelect();
         }
         updateToolStatus();
 }
diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp
index 75e1964..6e09efa 100644
--- a/linden/indra/newview/lltoolmorph.cpp
+++ b/linden/indra/newview/lltoolmorph.cpp
@@ -37,7 +37,7 @@
 #include "llrender.h"
 
 // Library includes
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llviewercontrol.h"
 #include "llfontgl.h"
 #include "sound_ids.h"
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 2b63a24..b121b1a 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -36,11 +36,11 @@
 
 #include "indra_constants.h"
 #include "llclickaction.h"
-#include "llmediabase.h"        // for status codes
 #include "llparcel.h"
 
 #include "llagent.h"
 #include "llviewercontrol.h"
+#include "llfocusmgr.h"
 #include "llfirstuse.h"
 #include "llfloateravatarinfo.h"
 #include "llfloaterland.h"
@@ -63,6 +63,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerwindow.h"
 #include "llviewermedia.h"
+#include "llviewermediafocus.h"
 #include "llvoavatar.h"
 #include "llworld.h"
 #include "llui.h"
@@ -72,13 +73,15 @@ extern void handle_buy(void*);
 
 extern BOOL gDebugClicks;
 
+static bool handle_media_click(const LLPickInfo& info);
+static bool handle_media_hover(const LLPickInfo& info);
 static void handle_click_action_play();
 static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp);
 static ECursorType cursor_from_parcel_media(U8 click_action);
 
 
 LLToolPie::LLToolPie()
-:       LLTool(std::string("Select")),
+:       LLTool(std::string("Pie")),
         mPieMouseButtonDown( FALSE ),
         mGrabMouseButtonDown( FALSE ),
         mMouseOutsideSlop( FALSE ),
@@ -110,6 +113,10 @@ BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
         return FALSE;
 }
 
+BOOL LLToolPie::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+}
 // static
 void LLToolPie::rightMouseCallback(const LLPickInfo& pick_info)
 {
@@ -143,6 +150,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         }
                 }
 
+                gFocusMgr.setKeyboardFocus(NULL);
                 return LLTool::handleMouseDown(x, y, mask);
         }
 
@@ -161,9 +169,11 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                 parent = object->getRootEdit();
         }
 
+
         BOOL touchable = (object && object->flagHandleTouch()) 
                                          || (parent && parent->flagHandleTouch());
 
+
         // If it's a left-click, and we have a special action, do it.
         if (useClickAction(always_show, mask, object, parent))
         {
@@ -195,6 +205,8 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting) && !gSavedSettings.getBOOL("BlockClickSit")) // agent not already sitting
                         {
                                 handle_sit_or_stand();
+                                // put focus in world when sitting on an object
+                                gFocusMgr.setKeyboardFocus(NULL);
                                 return TRUE;
                         } // else nothing (fall through to touch)
                         
@@ -247,6 +259,14 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                 }
         }
 
+        if (!always_show && handle_media_click(mPick))
+        {
+                return FALSE;
+        }
+
+        // put focus back "in world"
+        gFocusMgr.setKeyboardFocus(NULL);
+
         // Switch to grab tool if physical or triggerable
         if (object && 
                 !object->isAvatar() && 
@@ -614,41 +634,46 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
                 mMouseOutsideSlop = TRUE;
         }
         */
+
         
+        gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+
         LLViewerObject *object = NULL;
         LLViewerObject *parent = NULL;
-        if (gHoverView)
-        {
-                object = gViewerWindow->getHoverPick().getObject();
-        }
+        object = gViewerWindow->getHoverPick().getObject();
 
         if (object)
         {
                 parent = object->getRootEdit();
-        }
 
-        if (object && useClickAction(FALSE, mask, object, parent))
-        {
-                ECursorType cursor = cursor_from_object(object);
-                gViewerWindow->getWindow()->setCursor(cursor);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
-        }
-        else if ((object && !object->isAvatar() && object->usePhysics()) 
-                         || (parent && !parent->isAvatar() && parent->usePhysics()))
-        {
-                gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLGRAB);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
-        }
-        else if ( (object && object->flagHandleTouch()) 
-                          || (parent && parent->flagHandleTouch()))
-        {
-                gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
+                if (object && useClickAction(FALSE, mask, object, parent))
+                {
+                        ECursorType cursor = cursor_from_object(object);
+                        gViewerWindow->getWindow()->setCursor(cursor);
+                }
+                else if (handle_media_hover(gViewerWindow->getHoverPick()))
+                {
+                        // cursor set by media object
+                }
+                else if ((object && !object->isAvatar() && object->usePhysics()) 
+                                 || (parent && !parent->isAvatar() && parent->usePhysics()))
+                {
+                        gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLGRAB);
+                }
+                else if ( (object && object->flagHandleTouch()) 
+                                  || (parent && parent->flagHandleTouch()))
+                {
+                        gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
+                }
         }
         else
         {
-                gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
+                // We need to clear media hover flag
+                if (LLViewerMediaFocus::getInstance()->getMouseOverFlag())
+                {
+                        LLViewerMediaFocus::getInstance()->setMouseOverFlag(false);
+                }
+
         }
 
         return TRUE;
@@ -830,14 +855,14 @@ static void handle_click_action_play()
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if (!parcel) return;
 
-        LLMediaBase::EStatus status = LLViewerParcelMedia::getStatus();
+        LLViewerMediaImpl::EMediaStatus status = LLViewerParcelMedia::getStatus();
         switch(status)
         {
-                case LLMediaBase::STATUS_STARTED:
+                case LLViewerMediaImpl::MEDIA_PLAYING:
                         LLViewerParcelMedia::pause();
                         break;
 
-                case LLMediaBase::STATUS_PAUSED:
+                case LLViewerMediaImpl::MEDIA_PAUSED:
                         LLViewerParcelMedia::start();
                         break;
 
@@ -847,6 +872,111 @@ static void handle_click_action_play()
         }
 }
 
+static bool handle_media_click(const LLPickInfo& pick)
+{
+        //FIXME: how do we handle object in different parcel than us?
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        LLPointer<LLViewerObject> objectp = pick.getObject();
+
+
+        if (!parcel ||
+                objectp.isNull() ||
+                pick.mObjectFace < 0 || 
+                pick.mObjectFace >= objectp->getNumTEs()) 
+        {
+                LLSelectMgr::getInstance()->deselect();
+                LLViewerMediaFocus::getInstance()->clearFocus();
+
+                return false;
+        }
+
+
+
+        // HACK: This is directly referencing an impl name.  BAD!
+        // This can be removed when we have a truly generic media browser that only 
+        // builds an impl based on the type of url it is passed.
+
+        // is media playing on this face?
+        const LLTextureEntry* tep = objectp->getTE(pick.mObjectFace);
+
+        viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(tep->getID());
+        if (tep
+                && media_impl.notNull()
+                && media_impl->hasMedia()
+                && gSavedSettings.getBOOL("MediaOnAPrimUI"))
+        {
+                LLObjectSelectionHandle selection = LLViewerMediaFocus::getInstance()->getSelection(); 
+                if (! selection->contains(pick.getObject(), pick.mObjectFace))
+                {
+                        LLViewerMediaFocus::getInstance()->setFocusFace(TRUE, pick.getObject(), pick.mObjectFace, media_impl);
+                }
+                else
+                {
+                        media_impl->mouseDown(pick.mXYCoords.mX, pick.mXYCoords.mY);
+                        media_impl->mouseCapture(); // the mouse-up will happen when capture is lost
+                }
+
+                return true;
+        }
+
+        LLSelectMgr::getInstance()->deselect();
+        LLViewerMediaFocus::getInstance()->clearFocus();
+
+        return false;
+}
+
+static bool handle_media_hover(const LLPickInfo& pick)
+{
+        //FIXME: how do we handle object in different parcel than us?
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if (!parcel) return false;
+
+        LLPointer<LLViewerObject> objectp = pick.getObject();
+
+        // Early out cases.  Must clear mouse over media focus flag
+        // did not hit an object or did not hit a valid face
+        if ( objectp.isNull() ||
+                pick.mObjectFace < 0 || 
+                pick.mObjectFace >= objectp->getNumTEs() )
+        {
+                LLViewerMediaFocus::getInstance()->setMouseOverFlag(false);
+                return false;
+        }
+
+
+        // HACK: This is directly referencing an impl name.  BAD!
+        // This can be removed when we have a truly generic media browser that only 
+        // builds an impl based on the type of url it is passed.
+
+        // is media playing on this face?
+        const LLTextureEntry* tep = objectp->getTE(pick.mObjectFace);
+        viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(tep->getID());
+        if (tep
+                && media_impl.notNull()
+                && media_impl->hasMedia()
+                && gSavedSettings.getBOOL("MediaOnAPrimUI"))
+        {
+                if(LLViewerMediaFocus::getInstance()->getFocus())
+                {
+                        media_impl->mouseMove(pick.mXYCoords.mX, pick.mXYCoords.mY);
+                }
+
+                // Set mouse over flag if unset
+                if (! LLViewerMediaFocus::getInstance()->getMouseOverFlag())
+                {
+                        LLSelectMgr::getInstance()->setHoverObject(objectp, pick.mObjectFace);
+                        LLViewerMediaFocus::getInstance()->setMouseOverFlag(true, media_impl);
+                        LLViewerMediaFocus::getInstance()->setPickInfo(pick);
+                }
+
+                return true;
+        }
+        LLViewerMediaFocus::getInstance()->setMouseOverFlag(false);
+
+        return false;
+}
+
+
 static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
 {
         //FIXME: how do we handle object in different parcel than us?
@@ -861,7 +991,7 @@ static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
         if( face < 0 || face >= objectp->getNumTEs() ) return;
                 
         // is media playing on this face?
-        if (!LLViewerMedia::isActiveMediaTexture(objectp->getTE(face)->getID()))
+        if (LLViewerMedia::getMediaImplFromTextureID(objectp->getTE(face)->getID()) != NULL)
         {
                 handle_click_action_play();
                 return;
@@ -879,10 +1009,7 @@ static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
         // This can be removed when we have a truly generic media browser that only 
         // builds an impl based on the type of url it is passed.
 
-        if(     LLMediaManager::getInstance()->supportsMediaType( "LLMediaImplLLMozLib", media_scheme, media_type ) )
-        {
-                LLWeb::loadURL(media_url);
-        }
+        LLWeb::loadURL(media_url);
 }
 
 static ECursorType cursor_from_parcel_media(U8 click_action)
@@ -900,19 +1027,12 @@ static ECursorType cursor_from_parcel_media(U8 click_action)
         std::string media_type = std::string ( parcel->getMediaType() );
         LLStringUtil::trim(media_url);
 
-        // Get the scheme, see if that is handled as well.
-        LLURI uri(media_url);
-        std::string media_scheme = uri.scheme() != "" ? uri.scheme() : "http";
-
-        if(     LLMediaManager::getInstance()->supportsMediaType( "LLMediaImplLLMozLib", media_scheme, media_type ) )
-        {
-                open_cursor = UI_CURSOR_TOOLMEDIAOPEN;
-        }
+        open_cursor = UI_CURSOR_TOOLMEDIAOPEN;
 
-        LLMediaBase::EStatus status = LLViewerParcelMedia::getStatus();
+        LLViewerMediaImpl::EMediaStatus status = LLViewerParcelMedia::getStatus();
         switch(status)
         {
-                case LLMediaBase::STATUS_STARTED:
+                case LLViewerMediaImpl::MEDIA_PLAYING:
                         return click_action == CLICK_ACTION_PLAY ? UI_CURSOR_TOOLPAUSE : open_cursor;
                 default:
                         return UI_CURSOR_TOOLPLAY;
diff --git a/linden/indra/newview/lltoolpie.h b/linden/indra/newview/lltoolpie.h
index 113fba7..001886f 100644
--- a/linden/indra/newview/lltoolpie.h
+++ b/linden/indra/newview/lltoolpie.h
@@ -51,6 +51,7 @@ public:
         virtual BOOL            handleRightMouseUp(S32 x, S32 y, MASK mask);
         virtual BOOL            handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleScrollWheel(S32 x, S32 y, S32 clicks);
 
         virtual void            render();
 
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index d5c4de1..c031a18 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -59,7 +59,7 @@
 #include "llvolumemessage.h"
 #include "llhudmanager.h"
 #include "llagent.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llhudeffecttrail.h"
 #include "llviewerobjectlist.h"
 #include "llviewercamera.h"
diff --git a/linden/indra/newview/llurldispatcher.cpp b/linden/indra/newview/llurldispatcher.cpp
index f9b6b39..1144c58 100644
--- a/linden/indra/newview/llurldispatcher.cpp
+++ b/linden/indra/newview/llurldispatcher.cpp
@@ -39,7 +39,7 @@
 #include "llfloaterurldisplay.h"
 #include "llfloaterdirectory.h"
 #include "llfloaterworldmap.h"
-#include "llfloaterhtmlhelp.h"
+#include "llfloatermediabrowser.h"
 #include "llpanellogin.h"
 #include "llstartup.h"                  // gStartupState
 #include "llurlsimstring.h"
@@ -65,7 +65,7 @@ public:
         static bool isSLURLCommand(const std::string& url);
 
         static bool dispatch(const std::string& url,
-                                                 LLWebBrowserCtrl* web,
+                                                 LLMediaCtrl* web,
                                                  bool trusted_browser);
                 // returns true if handled or explicitly blocked.
 
@@ -74,7 +74,7 @@ public:
 private:
         static bool dispatchCore(const std::string& url, 
                                                          bool right_mouse,
-                                                         LLWebBrowserCtrl* web,
+                                                         LLMediaCtrl* web,
                                                          bool trusted_browser);
                 // handles both left and right click
 
@@ -84,7 +84,7 @@ private:
 
         static bool dispatchApp(const std::string& url,
                                                         bool right_mouse,
-                                                        LLWebBrowserCtrl* web,
+                                                        LLMediaCtrl* web,
                                                         bool trusted_browser);
                 // Handles secondlife:///app/agent/<agent_id>/about and similar
                 // by showing panel in Search floater.
@@ -138,7 +138,7 @@ bool LLURLDispatcherImpl::isSLURLCommand(const std::string& url)
 // static
 bool LLURLDispatcherImpl::dispatchCore(const std::string& url,
                                                                            bool right_mouse,
-                                                                           LLWebBrowserCtrl* web,
+                                                                           LLMediaCtrl* web,
                                                                            bool trusted_browser)
 {
         if (url.empty()) return false;
@@ -158,7 +158,7 @@ bool LLURLDispatcherImpl::dispatchCore(const std::string& url,
 
 // static
 bool LLURLDispatcherImpl::dispatch(const std::string& url,
-                                                                   LLWebBrowserCtrl* web,
+                                                                   LLMediaCtrl* web,
                                                                    bool trusted_browser)
 {
         llinfos << "url: " << url << llendl;
@@ -171,7 +171,7 @@ bool LLURLDispatcherImpl::dispatchRightClick(const std::string& url)
 {
         llinfos << "url: " << url << llendl;
         const bool right_click = true;
-        LLWebBrowserCtrl* web = NULL;
+        LLMediaCtrl* web = NULL;
         const bool trusted_browser = false;
         return dispatchCore(url, right_click, web, trusted_browser);
 }
@@ -192,7 +192,7 @@ bool LLURLDispatcherImpl::dispatchHelp(const std::string& url, bool right_mouse)
 // static
 bool LLURLDispatcherImpl::dispatchApp(const std::string& url, 
                                                                           bool right_mouse,
-                                                                          LLWebBrowserCtrl* web,
+                                                                          LLMediaCtrl* web,
                                                                           bool trusted_browser)
 {
         if (!isSLURL(url))
@@ -386,7 +386,7 @@ public:
         LLTeleportHandler() : LLCommandHandler("teleport", true) { }
 
         bool handle(const LLSD& tokens, const LLSD& query_map,
-                                LLWebBrowserCtrl* web)
+                                LLMediaCtrl* web)
         {
                 // construct a "normal" SLURL, resolve the region to
                 // a global position, and teleport to it
@@ -426,7 +426,7 @@ bool LLURLDispatcher::isSLURLCommand(const std::string& url)
 
 // static
 bool LLURLDispatcher::dispatch(const std::string& url,
-                                                           LLWebBrowserCtrl* web,
+                                                           LLMediaCtrl* web,
                                                            bool trusted_browser)
 {
         return LLURLDispatcherImpl::dispatch(url, web, trusted_browser);
@@ -448,7 +448,7 @@ bool LLURLDispatcher::dispatchFromTextEditor(const std::string& url)
         // click on it.
         // *TODO: Make this trust model more refined.  JC
         const bool trusted_browser = true;
-        LLWebBrowserCtrl* web = NULL;
+        LLMediaCtrl* web = NULL;
         return LLURLDispatcherImpl::dispatch(url, web, trusted_browser);
 }
 
diff --git a/linden/indra/newview/llurldispatcher.h b/linden/indra/newview/llurldispatcher.h
index a4f6866..c947e5e 100644
--- a/linden/indra/newview/llurldispatcher.h
+++ b/linden/indra/newview/llurldispatcher.h
@@ -32,7 +32,7 @@
 #ifndef LLURLDISPATCHER_H
 #define LLURLDISPATCHER_H
 
-class LLWebBrowserCtrl;
+class LLMediaCtrl;
 
 
 class LLURLDispatcher
@@ -45,7 +45,7 @@ public:
                 // Is this a special secondlife://app/ URL?
 
         static bool dispatch(const std::string& url,
-                                                 LLWebBrowserCtrl* web,
+                                                 LLMediaCtrl* web,
                                                  bool trusted_browser);
                 // At startup time and on clicks in internal web browsers,
                 // teleport, open map, or run requested command.
@@ -54,7 +54,7 @@ public:
                 //   secondlife:///app/agent/3d6181b0-6a4b-97ef-18d8-722652995cf1/show
                 //   sl://app/foo/bar
                 // @param web
-                //       Pointer to LLWebBrowserCtrl sending URL, can be NULL
+                //       Pointer to LLMediaCtrl sending URL, can be NULL
                 // @param trusted_browser
                 //   True if coming inside the app AND from a brower instance
                 //   that navigates to trusted (Linden Lab) pages.
diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index f043fb5..74b8e8f 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -32,7 +32,7 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llagent.h"
 #include "llappviewer.h"
 #include "llvieweraudio.h"
@@ -130,7 +130,6 @@ void audio_update_volume(bool force_update)
                 gAudiop->setMasterGain ( master_volume );
 
                 gAudiop->setDopplerFactor(gSavedSettings.getF32("AudioLevelDoppler"));
-                gAudiop->setDistanceFactor(gSavedSettings.getF32("AudioLevelDistance")); 
                 gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
 
                 if(wind_muted == false)
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 50224ad..1531e6c 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -38,7 +38,7 @@
 #include "indra_constants.h"
 
 // For Listeners
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llagent.h"
 #include "llconsole.h"
 #include "lldrawpoolterrain.h"
@@ -69,7 +69,6 @@
 #include "llvosurfacepatch.h"
 #include "llvowlsky.h"
 #include "llrender.h"
-#include "llmediamanager.h"
 #include "llslider.h"
 #include "llfloaterchat.h"
 
@@ -498,21 +497,6 @@ bool handleTranslateChatPrefsChanged(const LLSD& newvalue)
         return true;
 }
 
-bool handleMediaDebugLevelChanged(const LLSD& newvalue)
-{
-        LLMediaManager *mgr = LLMediaManager::getInstance();
-        if (mgr)
-        {
-                LLMediaBase *impl = 
-                  mgr->createSourceFromMimeType("http", "audio/mpeg");
-
-                if (impl)
-                {
-                        impl->setDebugLevel( (LLMediaBase::EDebugLevel)newvalue.asInteger() );
-                }
-        }
-        return true;
-}
 
 bool handleSliderScrollWheelMultiplierChanged(const LLSD& newvalue)
 {
@@ -674,7 +658,6 @@ void settings_setup_listeners()
         gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
-        gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
         gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1));     
         gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1));    
         
diff --git a/linden/indra/newview/llviewergesture.cpp b/linden/indra/newview/llviewergesture.cpp
index 01b3c58..7799c99 100644
--- a/linden/indra/newview/llviewergesture.cpp
+++ b/linden/indra/newview/llviewergesture.cpp
@@ -34,7 +34,7 @@
 
 #include "llviewergesture.h"
 
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "lldir.h"
 #include "llviewerinventory.h"
 #include "sound_ids.h"          // for testing
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 703d233..29c630b 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -593,7 +593,7 @@ void LLViewerImageList::updateImages(F32 max_time)
         llpushcallstacks ;
         if (!gNoRender && !gGLManager.mIsDisabled)
         {
-                LLViewerMedia::updateImagesMediaStreams();
+                LLViewerMedia::updateMedia();
         }
         llpushcallstacks ;
         updateImagesUpdateStats();
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp
index 15c8148..6dd7fb5 100644
--- a/linden/indra/newview/llviewerkeyboard.cpp
+++ b/linden/indra/newview/llviewerkeyboard.cpp
@@ -506,7 +506,7 @@ void start_chat( EKeystate s )
 void start_gesture( EKeystate s )
 {
         if (KEYSTATE_UP == s &&
-                !(gFocusMgr.getKeyboardFocus() && gFocusMgr.getKeyboardFocus()->acceptsTextInput()))
+                !(gFocusMgr.getKeyboardFocus() && dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus())->acceptsTextInput()))
         {
                 if (gChatBar->getCurrentChat().empty())
                 {
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 6bcf8ce..92ccf25 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -33,687 +33,1137 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llviewermedia.h"
-
+#include "llviewermediafocus.h"
+#include "llhoverview.h"
 #include "llmimetypes.h"
 #include "llviewercontrol.h"
 #include "llviewerimage.h"
 #include "llviewerwindow.h"
 #include "llviewerimagelist.h"
-#include "viewerversion.h"
+
+#include "llpluginclassmedia.h"
 
 #include "llevent.h"            // LLSimpleListener
-#include "llmediamanager.h"
 #include "lluuid.h"
+#include "llkeyboard.h"
 
-#include <boost/bind.hpp>       // for SkinFolder listener
-#include <boost/signal.hpp>
 
+// Merov: Temporary definitions while porting the new viewer media code to Snowglobe
+const int LEFT_BUTTON  = 0;
+const int RIGHT_BUTTON = 1;
 
-// Implementation functions not exported into header file
-class LLViewerMediaImpl
-        :       public LLMediaObserver
+// Move this to its own file.
+
+LLViewerMediaEventEmitter::~LLViewerMediaEventEmitter()
 {
-        public:
-                LLViewerMediaImpl()
-                :       mMediaSource( NULL ),
-                        mMovieImageID(),
-                        mMovieImageHasMips(false)
-                { }
-
-                void destroyMediaSource();
-
-            void play(const std::string& media_url,
-                                  const std::string& mime_type,
-                                  const LLUUID& placeholder_texture_id,
-                                  S32 media_width, S32 media_height, U8 media_auto_scale,
-                                  U8 media_loop);
-
-                void stop();
-                void pause();
-                void start();
-        void seek(F32 time);
-        void setVolume(F32 volume);
-                LLMediaBase::EStatus getStatus();
-
-                /*virtual*/ void onMediaSizeChange(const EventType& event_in);
-                /*virtual*/ void onMediaContentsChange(const EventType& event_in);
-
-                void updateMovieImage(const LLUUID& image_id, BOOL active);
-                void updateImagesMediaStreams();
-                LLUUID getMediaTextureID();
-
-                // Internally set our desired browser user agent string, including
-                // the Second Life version and skin name.  Used because we can
-                // switch skins without restarting the app.
-                static void updateBrowserUserAgent();
-
-                // Callback for when the SkinCurrent control is changed to
-                // switch the user agent string to indicate the new skin.
-                static bool handleSkinCurrentChanged(const LLSD& newvalue);
+        observerListType::iterator iter = mObservers.begin();
 
-        public:
+        while( iter != mObservers.end() )
+        {
+                LLViewerMediaObserver *self = *iter;
+                iter++;
+                remObserver(self);
+        }
+}
 
-                // a single media url with some data and an impl.
-                LLMediaBase* mMediaSource;
-                LLUUID mMovieImageID;
-                bool  mMovieImageHasMips;
-                std::string mMediaURL;
-                std::string mMimeType;
-    private:
-            void initializePlaceholderImage(LLViewerImage *placeholder_image, LLMediaBase *media_source);
-};
+///////////////////////////////////////////////////////////////////////////////
+//
+bool LLViewerMediaEventEmitter::addObserver( LLViewerMediaObserver* observer )
+{
+        if ( ! observer )
+                return false;
 
-static LLViewerMediaImpl sViewerMediaImpl;
+        if ( std::find( mObservers.begin(), mObservers.end(), observer ) != mObservers.end() )
+                return false;
 
-//////////////////////////////////////////////////////////////////////////////////////////
+        mObservers.push_back( observer );
+        observer->mEmitters.push_back( this );
 
-void LLViewerMediaImpl::destroyMediaSource()
+        return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+bool LLViewerMediaEventEmitter::remObserver( LLViewerMediaObserver* observer )
+{
+        if ( ! observer )
+                return false;
+
+        mObservers.remove( observer );
+        observer->mEmitters.remove(this);
+
+        return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+void LLViewerMediaEventEmitter::emitEvent( LLPluginClassMedia* media, LLPluginClassMediaOwner::EMediaEvent event )
 {
-        LLMediaManager* mgr = LLMediaManager::getInstance();
-        if ( mMediaSource )
+        observerListType::iterator iter = mObservers.begin();
+
+        while( iter != mObservers.end() )
         {
-                bool was_playing = LLViewerMedia::isMediaPlaying();
-                mMediaSource->remObserver(this);
-                mgr->destroySource( mMediaSource );
+                LLViewerMediaObserver *self = *iter;
+                ++iter;
+                self->handleMediaEvent( media, event );
+        }
+}
 
-                // Restore the texture
-                updateMovieImage(LLUUID::null, was_playing);
+// Move this to its own file.
+LLViewerMediaObserver::~LLViewerMediaObserver()
+{
+        std::list<LLViewerMediaEventEmitter *>::iterator iter = mEmitters.begin();
 
+        while( iter != mEmitters.end() )
+        {
+                LLViewerMediaEventEmitter *self = *iter;
+                iter++;
+                self->remObserver( this );
         }
-        mMediaSource = NULL;
 }
 
-void LLViewerMediaImpl::play(const std::string& media_url,
-                                                         const std::string& mime_type,
-                                                         const LLUUID& placeholder_texture_id,
-                                                         S32 media_width, S32 media_height, U8 media_auto_scale,
-                                                         U8 media_loop)
+
+// Move this to its own file.
+// helper class that tries to download a URL from a web site and calls a method
+// on the Panel Land Media and to discover the MIME type
+class LLMimeDiscoveryResponder : public LLHTTPClient::Responder
 {
-        // first stop any previously playing media
-        stop();
+LOG_CLASS(LLMimeDiscoveryResponder);
+public:
+        LLMimeDiscoveryResponder( viewer_media_t media_impl)
+                : mMediaImpl(media_impl),
+                  mInitialized(false)
+        {}
+
 
-        // Save this first, as init/load below may fire events
-        mMovieImageID = placeholder_texture_id;
 
-        // If the mime_type passed in is different than the cached one, and
-        // Auto-discovery is turned OFF, replace the cached mime_type with the new one.
-        if(mime_type != mMimeType &&
-                ! gSavedSettings.getBOOL("AutoMimeDiscovery"))
+        virtual void completedHeader(U32 status, const std::string& reason, const LLSD& content)
         {
-                mMimeType = mime_type;
+                std::string media_type = content["content-type"].asString();
+                std::string::size_type idx1 = media_type.find_first_of(";");
+                std::string mime_type = media_type.substr(0, idx1);
+                completeAny(status, mime_type);
         }
-        LLURI url(media_url);
-        std::string scheme = url.scheme() != "" ? url.scheme() : "http";
 
-        LLMediaManager* mgr = LLMediaManager::getInstance();
-        mMediaSource = mgr->createSourceFromMimeType(scheme, mMimeType );
-        if ( !mMediaSource )
+        virtual void error( U32 status, const std::string& reason )
         {
-                if (mMimeType != "none/none")
+                // completeAny(status, "none/none");
+        }
+
+        void completeAny(U32 status, const std::string& mime_type)
+        {
+                if(!mInitialized && ! mime_type.empty())
                 {
-                        llwarns << "media source create failed " << media_url
-                                        << " type " << mMimeType
-                                        << llendl;
+                        if (mMediaImpl->initializeMedia(mime_type))
+                        {
+                                mInitialized = true;
+                                mMediaImpl->play();
+                        }
                 }
-                return;
         }
 
-        // Store the URL and Mime Type
-        mMediaURL = media_url;
+        public:
+                viewer_media_t mMediaImpl;
+                bool mInitialized;
+};
+typedef std::list<LLViewerMediaImpl*> impl_list;
+static impl_list sViewerMediaImplList;
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// LLViewerMedia
 
-        if ((media_width != 0) && (media_height != 0))
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+viewer_media_t LLViewerMedia::newMediaImpl(const std::string& media_url,
+                                                                                                                 const LLUUID& texture_id,
+                                                                                                                 S32 media_width, S32 media_height, U8 media_auto_scale,
+                                                                                                                 U8 media_loop,
+                                                                                                                 std::string mime_type)
+{
+        LLViewerMediaImpl* media_impl = getMediaImplFromTextureID(texture_id);
+        if(media_impl == NULL || texture_id.isNull())
         {
-                mMediaSource->setRequestedMediaSize(media_width, media_height);
+                // Create the media impl
+                media_impl = new LLViewerMediaImpl(media_url, texture_id, media_width, media_height, media_auto_scale, media_loop, mime_type);
+                sViewerMediaImplList.push_back(media_impl);
         }
-
-        mMediaSource->setLooping(media_loop);
-        mMediaSource->setAutoScaled(media_auto_scale);
-        mMediaSource->addObserver( this );
-        mMediaSource->navigateTo( media_url );
-        mMediaSource->addCommand(LLMediaBase::COMMAND_START);
+        else
+        {
+                media_impl->stop();
+                media_impl->mTextureId = texture_id;
+                media_impl->mMediaURL = media_url;
+                media_impl->mMediaWidth = media_width;
+                media_impl->mMediaHeight = media_height;
+                media_impl->mMediaAutoScale = media_auto_scale;
+                media_impl->mMediaLoop = media_loop;
+                if(! media_url.empty())
+                        media_impl->navigateTo(media_url, mime_type, true);
+        }
+        return media_impl;
 }
 
-void LLViewerMediaImpl::stop()
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::removeMedia(LLViewerMediaImpl* media)
 {
-        destroyMediaSource();
+        impl_list::iterator iter = sViewerMediaImplList.begin();
+        impl_list::iterator end = sViewerMediaImplList.end();
+        
+        for(; iter != end; iter++)
+        {
+                if(media == *iter)
+                {
+                        sViewerMediaImplList.erase(iter);
+                        return;
+                }
+        }
 }
 
-void LLViewerMediaImpl::pause()
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+LLViewerMediaImpl* LLViewerMedia::getMediaImplFromTextureID(const LLUUID& texture_id)
 {
-        if(mMediaSource)
+        impl_list::iterator iter = sViewerMediaImplList.begin();
+        impl_list::iterator end = sViewerMediaImplList.end();
+
+        for(; iter != end; iter++)
         {
-                mMediaSource->addCommand(LLMediaBase::COMMAND_PAUSE);
+                LLViewerMediaImpl* media_impl = *iter;
+                if(media_impl->getMediaTextureID() == texture_id)
+                {
+                        return media_impl;
+                }
         }
+        return NULL;
 }
 
-void LLViewerMediaImpl::start()
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+std::string LLViewerMedia::getCurrentUserAgent()
 {
-        if(mMediaSource)
-        {
-                mMediaSource->addCommand(LLMediaBase::COMMAND_START);
-        }
+        // Don't use user-visible string to avoid 
+        // punctuation and strange characters.
+        std::string skin_name = gSavedSettings.getString("SkinCurrent");
+
+        // Just in case we need to check browser differences in A/B test
+        // builds.
+        std::string channel = gSavedSettings.getString("VersionChannelName");
+
+        // append our magic version number string to the browser user agent id
+        // See the HTTP 1.0 and 1.1 specifications for allowed formats:
+        // http://www.ietf.org/rfc/rfc1945.txt section 10.15
+        // http://www.ietf.org/rfc/rfc2068.txt section 3.8
+        // This was also helpful:
+        // http://www.mozilla.org/build/revised-user-agent-strings.html
+        std::ostringstream codec;
+        codec << "SecondLife/";
+        codec << "C64 Basic V2"; //imprudence fixme : this isn't anybodys business anyway
+//      codec << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD;
+//      codec << " (" << channel << "; " << skin_name << " skin)";
+//      llinfos << codec.str() << llendl;
+        
+        return codec.str();
 }
 
-void LLViewerMediaImpl::seek(F32 time)
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::updateBrowserUserAgent()
 {
-        if(mMediaSource)
+        std::string user_agent = getCurrentUserAgent();
+        
+        impl_list::iterator iter = sViewerMediaImplList.begin();
+        impl_list::iterator end = sViewerMediaImplList.end();
+
+        for(; iter != end; iter++)
         {
-                mMediaSource->seek(time);
+                LLViewerMediaImpl* pimpl = *iter;
+                if(pimpl->mMediaSource && pimpl->mMediaSource->pluginSupportsMediaBrowser())
+                {
+                        pimpl->mMediaSource->setBrowserUserAgent(user_agent);
+                }
         }
+
 }
 
-void LLViewerMediaImpl::setVolume(F32 volume)
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::handleSkinCurrentChanged(const LLSD& /*newvalue*/)
 {
-        if(mMediaSource)
+        // gSavedSettings is already updated when this function is called.
+        updateBrowserUserAgent();
+        return true;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::textureHasMedia(const LLUUID& texture_id)
+{
+        impl_list::iterator iter = sViewerMediaImplList.begin();
+        impl_list::iterator end = sViewerMediaImplList.end();
+
+        for(; iter != end; iter++)
         {
-                mMediaSource->setVolume( volume);
+                LLViewerMediaImpl* pimpl = *iter;
+                if(pimpl->getMediaTextureID() == texture_id)
+                {
+                        return true;
+                }
         }
+        return false;
 }
 
-LLMediaBase::EStatus LLViewerMediaImpl::getStatus()
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::setVolume(F32 volume)
 {
-        if (mMediaSource)
+        impl_list::iterator iter = sViewerMediaImplList.begin();
+        impl_list::iterator end = sViewerMediaImplList.end();
+
+        for(; iter != end; iter++)
         {
-                return mMediaSource->getStatus();
+                LLViewerMediaImpl* pimpl = *iter;
+                pimpl->setVolume(volume);
         }
-        else
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::updateMedia()
+{
+        impl_list::iterator iter = sViewerMediaImplList.begin();
+        impl_list::iterator end = sViewerMediaImplList.end();
+
+        for(; iter != end; iter++)
         {
-                return LLMediaBase::STATUS_UNKNOWN;
+                LLViewerMediaImpl* pimpl = *iter;
+                pimpl->update();
         }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
-void LLViewerMediaImpl::updateMovieImage(const LLUUID& uuid, BOOL active)
+void LLViewerMedia::cleanupClass()
 {
-        // IF the media image hasn't changed, do nothing
-        if (mMovieImageID == uuid)
+        // This is no longer necessary, since the list is no longer smart pointers.
+#if 0
+        while(!sViewerMediaImplList.empty())
         {
-                return;
+                sViewerMediaImplList.pop_back();
         }
-        // If we have changed media uuid, restore the old one
-        if (!mMovieImageID.isNull())
+#endif
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+// LLViewerMediaImpl
+//////////////////////////////////////////////////////////////////////////////////////////
+LLViewerMediaImpl::LLViewerMediaImpl(const std::string& media_url, 
+                                                                                  const LLUUID& texture_id, 
+                                                                                  S32 media_width, 
+                                                                                  S32 media_height, 
+                                                                                  U8 media_auto_scale, 
+                                                                                  U8 media_loop,
+                                                                                  const std::string& mime_type)
+:       
+        mMediaSource( NULL ),
+        mMovieImageHasMips(false),
+        mTextureId(texture_id),
+        mMediaWidth(media_width),
+        mMediaHeight(media_height),
+        mMediaAutoScale(media_auto_scale),
+        mMediaLoop(media_loop),
+        mMediaURL(media_url),
+        mMimeType(mime_type),
+        mNeedsNewTexture(true),
+        mSuspendUpdates(false),
+        mVisible(true)
+{ 
+        createMediaSource();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+LLViewerMediaImpl::~LLViewerMediaImpl()
+{
+        if( gEditMenuHandler == this )
         {
-                LLViewerImage* oldImage = LLViewerImage::getImage( mMovieImageID );
-                if (oldImage)
-                {
-                        oldImage->reinit(mMovieImageHasMips);
-                        oldImage->mIsMediaTexture = FALSE;
-                }
-                mMovieImageID.setNull();
+                gEditMenuHandler = NULL;
         }
-        // If the movie is playing, set the new media image
-        if (active && !uuid.isNull())
+        
+        destroyMediaSource();
+        LLViewerMedia::removeMedia(this);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+bool LLViewerMediaImpl::initializeMedia(const std::string& mime_type)
+{
+        if((mMediaSource == NULL) || (mMimeType != mime_type))
         {
-                LLViewerImage* viewerImage = LLViewerImage::getImage( uuid );
-                if( viewerImage )
+                if(! initializePlugin(mime_type))
                 {
-                        mMovieImageID = uuid;
-                        // Can't use mipmaps for movies because they don't update the full image
-                        mMovieImageHasMips = viewerImage->getUseMipMaps();
-                        viewerImage->reinit(FALSE);
-                        viewerImage->mIsMediaTexture = TRUE;
+                        LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << mime_type << LL_ENDL;
+                        LLSD args;
+                        args["MIME_TYPE"] = mime_type;
+                        LLNotifications::instance().add("NoPlugin", args);
+
+                        return false;
                 }
         }
-}
 
+        // play();
+        return (mMediaSource != NULL);
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-void LLViewerMediaImpl::updateImagesMediaStreams()
+void LLViewerMediaImpl::createMediaSource()
 {
-        LLMediaManager::updateClass();
+        if(! mMediaURL.empty())
+        {
+                navigateTo(mMediaURL, mMimeType, true);
+        }
+        else if(! mMimeType.empty())
+        {
+                initializeMedia(mMimeType);
+        }
+        
 }
 
-void LLViewerMediaImpl::initializePlaceholderImage(LLViewerImage *placeholder_image, LLMediaBase *media_source)
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::destroyMediaSource()
 {
-        int media_width = media_source->getMediaWidth();
-        int media_height = media_source->getMediaHeight();
-        //int media_rowspan = media_source->getMediaRowSpan();
-
-        // if width & height are invalid, don't bother doing anything
-        if ( media_width < 1 || media_height < 1 )
+        mNeedsNewTexture = true;
+        if(! mMediaSource)
+        {
                 return;
+        }
+        // Restore the texture
+        updateMovieImage(LLUUID::null, false);
+        delete mMediaSource;
+        mMediaSource = NULL;
+}
 
-        llinfos << "initializing media placeholder" << llendl;
-        llinfos << "movie image id " << mMovieImageID << llendl;
-
-        int texture_width = LLMediaManager::textureWidthFromMediaWidth( media_width );
-        int texture_height = LLMediaManager::textureHeightFromMediaHeight( media_height );
-        int texture_depth = media_source->getMediaDepth();
-
-        // MEDIAOPT: check to see if size actually changed before doing work
-        placeholder_image->destroyGLTexture();
-        // MEDIAOPT: apparently just calling setUseMipMaps(FALSE) doesn't work?
-        placeholder_image->reinit(FALSE);       // probably not needed
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::setMediaType(const std::string& media_type)
+{
+        mMimeType = media_type;
+}
 
-        // MEDIAOPT: seems insane that we actually have to make an imageraw then
-        // immediately discard it
-        LLPointer<LLImageRaw> raw = new LLImageRaw(texture_width, texture_height, texture_depth);
-        raw->clear(0x0f, 0x0f, 0x0f, 0xff);
-        int discard_level = 0;
+//////////////////////////////////////////////////////////////////////////////////////////
+/*static*/
+LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height)
+{
+        std::string plugin_basename = LLMIMETypes::implType(media_type);
 
-        // ask media source for correct GL image format constants
-        placeholder_image->setExplicitFormat(media_source->getTextureFormatInternal(),
-                                                                                 media_source->getTextureFormatPrimary(),
-                                                                                 media_source->getTextureFormatType());
+        if(plugin_basename.empty())
+        {
+                LL_WARNS("Media") << "Couldn't find plugin for media type " << media_type << LL_ENDL;
+        }
+        else
+        {
+                std::string launcher_name = gDirUtilp->getLLPluginLauncher();
+                std::string plugin_name = gDirUtilp->getLLPluginFilename(plugin_basename);
+                std::string user_data_path = gDirUtilp->getOSUserAppDir();
+                user_data_path += gDirUtilp->getDirDelimiter();
+
+                // See if the plugin executable exists
+                llstat s;
+                if(LLFile::stat(launcher_name, &s))
+                {
+                        LL_WARNS("Media") << "Couldn't find launcher at " << launcher_name << LL_ENDL;
+                }
+                else if(LLFile::stat(plugin_name, &s))
+                {
+                        LL_WARNS("Media") << "Couldn't find plugin at " << plugin_name << LL_ENDL;
+                }
+                else
+                {
+                        LLPluginClassMedia* media_source = new LLPluginClassMedia(owner);
+                        media_source->setSize(default_width, default_height);
+                        if (media_source->init(launcher_name, plugin_name, false, user_data_path))
+                        {
+                                return media_source;
+                        }
+                        else
+                        {
+                                LL_WARNS("Media") << "Failed to init plugin.  Destroying." << LL_ENDL;
+                                delete media_source;
+                        }
+                }
+        }
+        
+        return NULL;
+}                                                       
 
-        placeholder_image->createGLTexture(discard_level, raw);
+//////////////////////////////////////////////////////////////////////////////////////////
+bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
+{
+        if(mMediaSource)
+        {
+                // Save the previous media source's last set size before destroying it.
+                mMediaWidth = mMediaSource->getSetWidth();
+                mMediaHeight = mMediaSource->getSetHeight();
+        }
+        
+        // Always delete the old media impl first.
+        destroyMediaSource();
+        
+        // and unconditionally set the mime type
+        mMimeType = media_type;
 
-        // placeholder_image->setExplicitFormat()
-        placeholder_image->setUseMipMaps(FALSE);
+        LLPluginClassMedia* media_source = newSourceFromMediaType(media_type, this, mMediaWidth, mMediaHeight);
+        
+        if (media_source)
+        {
+                media_source->setDisableTimeout(gSavedSettings.getBOOL("DebugPluginDisableTimeout"));
+                media_source->setLoop(mMediaLoop);
+                media_source->setAutoScale(mMediaAutoScale);
+                media_source->setBrowserUserAgent(LLViewerMedia::getCurrentUserAgent());
+                
+                mMediaSource = media_source;
+                return true;
+        }
 
-        // MEDIAOPT: set this dynamically on play/stop
-        placeholder_image->mIsMediaTexture = true;
+        return false;
 }
 
+void LLViewerMediaImpl::setSize(int width, int height)
+{
+        mMediaWidth = width;
+        mMediaHeight = height;
+        if(mMediaSource)
+        {
+                mMediaSource->setSize(width, height);
+        }
+}
 
-
-// virtual
-void LLViewerMediaImpl::onMediaContentsChange(const EventType& event_in)
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::play()
 {
-        LLMediaBase* media_source = event_in.getSubject();
-        LLViewerImage* placeholder_image = gImageList.getImage( mMovieImageID );
-        if ((placeholder_image) && (placeholder_image->getHasGLTexture()))
+        // first stop any previously playing media
+        // stop();
+
+        // mMediaSource->addObserver( this );
+        if(mMediaSource == NULL)
         {
-                if (placeholder_image->getUseMipMaps())
+                if(!initializePlugin(mMimeType))
                 {
-                        // bad image!  NO MIPMAPS!
-                        initializePlaceholderImage(placeholder_image, media_source);
+                        // Plugin failed initialization... should assert or something
+                        return;
                 }
+        }
+        
+        // updateMovieImage(mTextureId, true);
 
-                U8* data = media_source->getMediaData();
-                S32 x_pos = 0;
-                S32 y_pos = 0;
-                S32 width = media_source->getMediaWidth();
-                S32 height = media_source->getMediaHeight();
-                S32 data_width = media_source->getMediaDataWidth();
-                S32 data_height = media_source->getMediaDataHeight();
-                placeholder_image->setSubImage(data, data_width, data_height,
-                        x_pos, y_pos, width, height);
+        mMediaSource->loadURI( mMediaURL );
+        if(/*mMediaSource->pluginSupportsMediaTime()*/ true)
+        {
+                start();
         }
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::stop()
+{
+        if(mMediaSource)
+        {
+                mMediaSource->stop();
+                // destroyMediaSource();
+        }
+}
 
-// virtual
-void LLViewerMediaImpl::onMediaSizeChange(const EventType& event_in)
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::pause()
 {
-        LLMediaBase* media_source = event_in.getSubject();
-        LLViewerImage* placeholder_image = gImageList.getImage( mMovieImageID );
-        if (placeholder_image)
+        if(mMediaSource)
         {
-                initializePlaceholderImage(placeholder_image, media_source);
+                mMediaSource->pause();
         }
-        else
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::start()
+{
+        if(mMediaSource)
         {
-                llinfos << "no placeholder image" << llendl;
+                mMediaSource->start();
         }
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::seek(F32 time)
+{
+        if(mMediaSource)
+        {
+                mMediaSource->seek(time);
+        }
+}
 
-                // Get the image we're using
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::setVolume(F32 volume)
+{
+        if(mMediaSource)
+        {
+                mMediaSource->setVolume(volume);
+        }
+}
 
-        /*
-        // update media stream if required
-        LLMediaEngine* media_engine = LLMediaEngine::getInstance();
-        if (media_engine)
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::focus(bool focus)
+{
+        if (mMediaSource)
         {
-                if ( media_engine->update() )
-                {
-                        LLUUID media_uuid = media_engine->getImageUUID();
-                        updateMovieImage(media_uuid, TRUE);
-                        if (!media_uuid.isNull())
-                        {
-                                LLViewerImage* viewerImage = getImage( media_uuid );
-                                if( viewerImage )
-                                {
-                                        LLMediaBase* renderer = media_engine->getMediaRenderer();
-                                        if ((renderer->getTextureWidth() != viewerImage->getWidth()) ||
-                                                (renderer->getTextureHeight() != viewerImage->getHeight()) ||
-                                                (renderer->getTextureDepth() != viewerImage->getComponents()) ||
-                                                (viewerImage->getHasGLTexture() == FALSE))
-                                        {
-                                                // destroy existing GL image
-                                                viewerImage->destroyGLTexture();
-
-                                                // set new size
-                                                viewerImage->setSize( renderer->getTextureWidth(),
-                                                                                                renderer->getTextureHeight(),
-                                                                                                renderer->getTextureDepth() );
-
-                                                LLPointer<LLImageRaw> raw = new LLImageRaw(renderer->getTextureWidth(),
-                                                                                                                                        renderer->getTextureHeight(),
-                                                                                                                                        renderer->getTextureDepth());
-                                                raw->clear(0x7f,0x7f,0x7f,0xff);
-                                                viewerImage->createGLTexture(0, raw);
-                                        }
-
-                                        // Set the explicit format the instance wants
-                                        viewerImage->setExplicitFormat(renderer->getTextureFormatInternal(),
-                                                                                                        renderer->getTextureFormatPrimary(),
-                                                                                                        renderer->getTextureFormatType(),
-                                                                                                        renderer->getTextureFormatSwapBytes());
-                                        // This should be redundant, but just in case:
-                                        viewerImage->setUseMipMaps(FALSE);
-
-                                        LLImageRaw* rawImage = media_engine->getImageRaw();
-                                        if ( rawImage )
-                                        {
-                                                viewerImage->setSubImage(rawImage, 0, 0,
-                                                                                                        renderer->getMediaWidth(),
-                                                                                                        renderer->getMediaHeight());
-                                        }
-                                }
-                                else
-                                {
-                                        llwarns << "MediaEngine update unable to get viewer image for GL texture" << llendl;
-                                }
-                        }
-                }
-                else
+                // call focus just for the hell of it, even though this apopears to be a nop
+                mMediaSource->focus(focus);
+                if (focus)
                 {
-                        LLUUID media_uuid = media_engine->getImageUUID();
-                        updateMovieImage(media_uuid, FALSE);
+                        // spoof a mouse click to *actually* pass focus
+                        // Don't do this anymore -- it actually clicks through now.
+//                      mMediaSource->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_DOWN, 1, 1, 0);
+//                      mMediaSource->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_UP, 1, 1, 0);
                 }
         }
-        */
-
+}
 
-LLUUID LLViewerMediaImpl::getMediaTextureID()
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::mouseDown(S32 x, S32 y)
 {
-        return mMovieImageID;
+        scaleMouse(&x, &y);
+        mLastMouseX = x;
+        mLastMouseY = y;
+        if (mMediaSource)
+        {
+                mMediaSource->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_DOWN, LEFT_BUTTON, x, y, 0);
+        }
 }
 
-// static
-void LLViewerMediaImpl::updateBrowserUserAgent()
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::mouseUp(S32 x, S32 y)
 {
-        // Don't use user-visible string to avoid 
-        // punctuation and strange characters.
-        std::string skin_name = gSavedSettings.getString("SkinCurrent");
-
-        // Just in case we need to check browser differences in A/B test
-        // builds.
-        std::string channel = gSavedSettings.getString("VersionChannelName");
-
-        // append our magic version number string to the browser user agent id
-        // See the HTTP 1.0 and 1.1 specifications for allowed formats:
-        // http://www.ietf.org/rfc/rfc1945.txt section 10.15
-        // http://www.ietf.org/rfc/rfc2068.txt section 3.8
-        // This was also helpful:
-        // http://www.mozilla.org/build/revised-user-agent-strings.html
-        std::ostringstream codec;
-        codec << "SecondLife/";
-        codec << ViewerVersion::getLLMajorVersion() << "." << ViewerVersion::getLLMinorVersion() << "." << ViewerVersion::getLLPatchVersion() << "." << ViewerVersion::getLLBuildVersion();
-        codec << " (" << channel << "; " << skin_name << " skin)";
-        llinfos << codec.str() << llendl;
-        LLMediaManager::setBrowserUserAgent( codec.str() );
+        scaleMouse(&x, &y);
+        mLastMouseX = x;
+        mLastMouseY = y;
+        if (mMediaSource)
+        {
+                mMediaSource->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_UP, LEFT_BUTTON, x, y, 0);
+        }
 }
 
-// static
-bool LLViewerMediaImpl::handleSkinCurrentChanged(const LLSD& /*newvalue*/)
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::mouseMove(S32 x, S32 y)
 {
-        // gSavedSettings is already updated when this function is called.
-        updateBrowserUserAgent();
-        return true;
+        scaleMouse(&x, &y);
+        mLastMouseX = x;
+        mLastMouseY = y;
+        if (mMediaSource)
+        {
+                mMediaSource->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_MOVE, LEFT_BUTTON, x, y, 0);
+        }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// Wrapper class
+void LLViewerMediaImpl::mouseLeftDoubleClick(S32 x, S32 y)
+{
+        scaleMouse(&x, &y);
+        mLastMouseX = x;
+        mLastMouseY = y;
+        if (mMediaSource)
+        {
+                mMediaSource->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_DOUBLE_CLICK, LEFT_BUTTON, x, y, 0);
+        }
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::onMouseCaptureLost()
+{
+        if (mMediaSource)
+        {
+                mMediaSource->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_UP, LEFT_BUTTON, mLastMouseX, mLastMouseY, 0);
+        }
+}
 
+//////////////////////////////////////////////////////////////////////////////////////////
+BOOL LLViewerMediaImpl::handleMouseUp(S32 x, S32 y, MASK mask) 
+{ 
+        // NOTE: this is called when the mouse is released when we have capture.
+        // Due to the way mouse coordinates are mapped to the object, we can't use the x and y coordinates that come in with the event.
+        
+        if(hasMouseCapture())
+        {
+                // Release the mouse -- this will also send a mouseup to the media
+                gFocusMgr.setMouseCapture( FALSE );
+        }
 
+        return TRUE; 
+}
 //////////////////////////////////////////////////////////////////////////////////////////
-// The viewer takes a long time to load the start screen.  Part of the problem
-// is media initialization -- in particular, QuickTime loads many DLLs and
-// hits the disk heavily.  So we initialize only the browser component before
-// the login screen, then do the rest later when we have a progress bar. JC
-// static
-void LLViewerMedia::initBrowser()
+void LLViewerMediaImpl::navigateHome()
 {
-        LLMediaManagerData* init_data = new LLMediaManagerData;
-        buildMediaManagerData( init_data );
-        LLMediaManager::initBrowser( init_data );
-        delete init_data;
-
-        // We use a custom user agent with viewer version and skin name.
-        LLViewerMediaImpl::updateBrowserUserAgent();
+        if(mMediaSource)
+        {
+                mMediaSource->loadURI( mHomeURL );
+        }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-void LLViewerMedia::initClass()
+void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mime_type,  bool rediscover_type)
 {
-        // *TODO: This looks like a memory leak to me. JC
-        LLMediaManagerData* init_data = new LLMediaManagerData;
-        buildMediaManagerData( init_data );
-        LLMediaManager::initClass( init_data );
-        delete init_data;
+        if(rediscover_type)
+        {
+
+                LLURI uri(url);
+                std::string scheme = uri.scheme();
 
-        LLMediaManager* mm = LLMediaManager::getInstance();
-        LLMIMETypes::mime_info_map_t::const_iterator it;
-        for (it = LLMIMETypes::sMap.begin(); it != LLMIMETypes::sMap.end(); ++it)
+                if(scheme.empty() || "http" == scheme || "https" == scheme)
+                {
+                        LLHTTPClient::getHeaderOnly( url, new LLMimeDiscoveryResponder(this));
+                }
+                else if("data" == scheme || "file" == scheme || "about" == scheme)
+                {
+                        // FIXME: figure out how to really discover the type for these schemes
+                        // We use "data" internally for a text/html url for loading the login screen
+                        if(initializeMedia("text/html"))
+                        {
+                                mMediaSource->loadURI( url );
+                        }
+                }
+                else
+                {
+                        // This catches 'rtsp://' urls
+                        if(initializeMedia(scheme))
+                        {
+                                mMediaSource->loadURI( url );
+                        }
+                }
+        }
+        else if (mMediaSource)
         {
-                const std::string& mime_type = it->first;
-                const LLMIMETypes::LLMIMEInfo& info = it->second;
-                mm->addMimeTypeImplNameMap( mime_type, info.mImpl );
+                mMediaSource->loadURI( url );
         }
-
-        LLMediaBase *impl = mm->createSourceFromMimeType("http", "audio/mpeg");
-        if (impl)
+        else if(initializeMedia(mime_type) && mMediaSource)
+        {
+                mMediaSource->loadURI( url );
+        }
+        else
         {
-                U32 level = gSavedSettings.getU32("MediaDebugLevel");
-                impl->setDebugLevel( (LLMediaBase::EDebugLevel)level );
+                LL_WARNS("Media") << "Couldn't navigate to: " << url << " as there is no media type for: " << mime_type << LL_ENDL;
+                return;
         }
+        mMediaURL = url;
+
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data )
-{
-//      std::string executable_dir = std::string( arg0 ).substr( 0, std::string( arg0 ).find_last_of("\\/") );
-//      std::string component_dir = std::string( executable_dir ).substr( 0, std::string( executable_dir ).find_last_of("\\/") );
-//      component_dir = std::string( component_dir ).substr( 0, std::string( component_dir ).find_last_of("\\/") );
-//      component_dir = std::string( component_dir ).substr( 0, std::string( component_dir ).find_last_of("\\/") );
-//      component_dir += "\\newview\\app_settings\\mozilla";
-
-
-#if LL_DARWIN
-        // For Mac OS, we store both the shared libraries and the runtime files (chrome/, plugins/, etc) in
-        // Second Life.app/Contents/MacOS/.  This matches the way Firefox is distributed on the Mac.
-        std::string component_dir(gDirUtilp->getExecutableDir());
-#elif LL_WINDOWS
-        std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
-        component_dir += gDirUtilp->getDirDelimiter();
-  #ifdef LL_DEBUG
-        component_dir += "mozilla_debug";
-  #else // LL_DEBUG
-        component_dir += "mozilla";
-  #endif // LL_DEBUG
-#elif LL_LINUX
-        std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
-        component_dir += gDirUtilp->getDirDelimiter();
-
-  #if LINUX64 
-        component_dir += "mozilla-runtime-linux-x86_64";
-  #else
-        component_dir += "mozilla-runtime-linux-i686";
-  #endif
-
-#elif LL_SOLARIS
-        std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
-        component_dir += gDirUtilp->getDirDelimiter();
-        #ifdef  __sparc
-                component_dir += "mozilla-solaris-sparc";
-        #else
-                component_dir += "mozilla-solaris-i686";
-        #endif
-#else
-        std::string component_dir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) );
-        component_dir += gDirUtilp->getDirDelimiter();
-        component_dir += "mozilla";
-#endif
-
-        std::string application_dir = gDirUtilp->getExecutableDir();
+void LLViewerMediaImpl::navigateStop()
+{
+        if(mMediaSource)
+        {
+                mMediaSource->browse_stop();
+        }
 
-        init_data->setBrowserApplicationDir( application_dir );
-        std::string profile_dir = gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" );
-        init_data->setBrowserProfileDir( profile_dir );
-        init_data->setBrowserComponentDir( component_dir );
-        std::string profile_name("Second Life");
-        init_data->setBrowserProfileName( profile_name );
-        init_data->setBrowserParentWindow( gViewerWindow->getMediaWindow() );
+}
 
-        // Users can change skins while client is running, so make sure
-        // we pick up on changes.
-        gSavedSettings.getControl("SkinCurrent")->getSignal()->connect( 
-                boost::bind( LLViewerMediaImpl::handleSkinCurrentChanged, _1 ) );
+//////////////////////////////////////////////////////////////////////////////////////////
+bool LLViewerMediaImpl::handleKeyHere(KEY key, MASK mask)
+{
+        bool result = false;
+        
+        if (mMediaSource)
+        {
+                result = mMediaSource->keyEvent(LLPluginClassMedia::KEY_EVENT_DOWN ,key, mask);
+        }
+        
+        return result;
+}
 
+//////////////////////////////////////////////////////////////////////////////////////////
+bool LLViewerMediaImpl::handleUnicodeCharHere(llwchar uni_char)
+{
+        bool result = false;
+        
+        if (mMediaSource)
+        {
+                // only accept 'printable' characters, sigh...
+                if (uni_char >= 32 // discard 'control' characters
+                        && uni_char != 127) // SDL thinks this is 'delete' - yuck.
+                {
+                        mMediaSource->textInput(wstring_to_utf8str(LLWString(1, uni_char)), gKeyboard->currentMask(FALSE));
+                }
+        }
+        
+        return result;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-void LLViewerMedia::cleanupClass()
+bool LLViewerMediaImpl::canNavigateForward()
 {
-        stop() ;
-        LLMediaManager::cleanupClass();
+        BOOL result = FALSE;
+        if (mMediaSource)
+        {
+                result = mMediaSource->getHistoryForwardAvailable();
+        }
+        return result;
 }
 
-// static
-void LLViewerMedia::play(const std::string& media_url,
-                                                 const std::string& mime_type,
-                                                 const LLUUID& placeholder_texture_id,
-                                                 S32 media_width, S32 media_height, U8 media_auto_scale,
-                                                 U8 media_loop)
+//////////////////////////////////////////////////////////////////////////////////////////
+bool LLViewerMediaImpl::canNavigateBack()
 {
-        sViewerMediaImpl.play(media_url, mime_type, placeholder_texture_id,
-                                                  media_width, media_height, media_auto_scale, media_loop);
+        BOOL result = FALSE;
+        if (mMediaSource)
+        {
+                result = mMediaSource->getHistoryBackAvailable();
+        }
+        return result;
 }
 
-// static
-void LLViewerMedia::stop()
+
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::updateMovieImage(const LLUUID& uuid, BOOL active)
 {
-        sViewerMediaImpl.stop();
+        // IF the media image hasn't changed, do nothing
+        if (mTextureId == uuid)
+        {
+                return;
+        }
+        // If we have changed media uuid, restore the old one
+        if (!mTextureId.isNull())
+        {
+                LLViewerImage* oldImage = LLViewerImage::getImage( mTextureId );
+                if (oldImage)
+                {
+                        oldImage->reinit(mMovieImageHasMips);
+                        oldImage->mIsMediaTexture = FALSE;
+                }
+        }
+        // If the movie is playing, set the new media image
+        if (active && !uuid.isNull())
+        {
+                LLViewerImage* viewerImage = LLViewerImage::getImage( uuid );
+                if( viewerImage )
+                {
+                        mTextureId = uuid;
+                        // Can't use mipmaps for movies because they don't update the full image
+                        mMovieImageHasMips = viewerImage->getUseMipMaps();
+                        viewerImage->reinit(FALSE);
+                        viewerImage->mIsMediaTexture = TRUE;
+                }
+        }
 }
 
-// static
-void LLViewerMedia::pause()
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::update()
 {
-        sViewerMediaImpl.pause();
+        if(mMediaSource == NULL)
+        {
+                return;
+        }
+        
+        mMediaSource->idle();
+        
+        if(mMediaSource->isPluginExited())
+        {
+                destroyMediaSource();
+                return;
+        }
+
+        if(!mMediaSource->textureValid())
+        {
+                return;
+        }
+        
+        if(mSuspendUpdates || !mVisible)
+        {
+                return;
+        }
+        
+        LLViewerImage* placeholder_image = updatePlaceholderImage();
+                
+        if(placeholder_image)
+        {
+                LLRect dirty_rect;
+                if(mMediaSource->getDirty(&dirty_rect))
+                {
+                        // Constrain the dirty rect to be inside the texture
+                        S32 x_pos = llmax(dirty_rect.mLeft, 0);
+                        S32 y_pos = llmax(dirty_rect.mBottom, 0);
+                        S32 width = llmin(dirty_rect.mRight, placeholder_image->getWidth()) - x_pos;
+                        S32 height = llmin(dirty_rect.mTop, placeholder_image->getHeight()) - y_pos;
+                        
+                        if(width > 0 && height > 0)
+                        {
+
+                                U8* data = mMediaSource->getBitsData();
+
+                                // Offset the pixels pointer to match x_pos and y_pos
+                                data += ( x_pos * mMediaSource->getTextureDepth() * mMediaSource->getBitsWidth() );
+                                data += ( y_pos * mMediaSource->getTextureDepth() );
+                                
+                                placeholder_image->setSubImage(
+                                                data, 
+                                                mMediaSource->getBitsWidth(), 
+                                                mMediaSource->getBitsHeight(),
+                                                x_pos, 
+                                                y_pos, 
+                                                width, 
+                                                height,
+                                                TRUE);          // force a fast update (i.e. don't call analyzeAlpha, etc.)
+
+                        }
+                        
+                        mMediaSource->resetDirty();
+                }
+        }
 }
 
-// static
-void LLViewerMedia::start()
+
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::updateImagesMediaStreams()
 {
-        sViewerMediaImpl.start();
 }
 
-// static
-void LLViewerMedia::seek(F32 time)
+
+//////////////////////////////////////////////////////////////////////////////////////////
+LLViewerImage* LLViewerMediaImpl::updatePlaceholderImage()
 {
-        sViewerMediaImpl.seek(time);
+        if(mTextureId.isNull())
+        {
+                // The code that created this instance will read from the plugin's bits.
+                return NULL;
+        }
+        
+        LLViewerImage* placeholder_image = gImageList.getImage( mTextureId );
+        
+        if (mNeedsNewTexture 
+                || placeholder_image->getUseMipMaps()
+                || ! placeholder_image->mIsMediaTexture
+                || placeholder_image->getWidth() != mMediaSource->getTextureWidth()
+                || placeholder_image->getHeight() != mMediaSource->getTextureHeight())
+        {
+                llinfos << "initializing media placeholder" << llendl;
+                llinfos << "movie image id " << mTextureId << llendl;
+
+                int texture_width = mMediaSource->getTextureWidth();
+                int texture_height = mMediaSource->getTextureHeight();
+                int texture_depth = mMediaSource->getTextureDepth();
+                
+                // MEDIAOPT: check to see if size actually changed before doing work
+                placeholder_image->destroyGLTexture();
+                // MEDIAOPT: apparently just calling setUseMipMaps(FALSE) doesn't work?
+                placeholder_image->reinit(FALSE);       // probably not needed
+
+                // MEDIAOPT: seems insane that we actually have to make an imageraw then
+                // immediately discard it
+                LLPointer<LLImageRaw> raw = new LLImageRaw(texture_width, texture_height, texture_depth);
+                raw->clear(0x0f, 0x0f, 0x0f, 0xff);
+                int discard_level = 0;
+
+                // ask media source for correct GL image format constants
+                placeholder_image->setExplicitFormat(mMediaSource->getTextureFormatInternal(),
+                                                                                         mMediaSource->getTextureFormatPrimary(),
+                                                                                         mMediaSource->getTextureFormatType(),
+                                                                                         mMediaSource->getTextureFormatSwapBytes());
+
+                placeholder_image->createGLTexture(discard_level, raw);
+
+                // placeholder_image->setExplicitFormat()
+                placeholder_image->setUseMipMaps(FALSE);
+
+                // MEDIAOPT: set this dynamically on play/stop
+                placeholder_image->mIsMediaTexture = true;
+                mNeedsNewTexture = false;
+        }
+        
+        return placeholder_image;
 }
 
-// static
-void LLViewerMedia::setVolume(F32 volume)
+
+//////////////////////////////////////////////////////////////////////////////////////////
+LLUUID LLViewerMediaImpl::getMediaTextureID()
 {
-        sViewerMediaImpl.setVolume(volume);
+        return mTextureId;
 }
 
-// static
-LLMediaBase::EStatus LLViewerMedia::getStatus()
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::setVisible(bool visible)
 {
-        return sViewerMediaImpl.getStatus();
+        mVisible = visible;
+        
+        if(mVisible)
+        {
+                if(mMediaSource && mMediaSource->isPluginExited())
+                {
+                        destroyMediaSource();
+                }
+                
+                if(!mMediaSource)
+                {
+                        createMediaSource();
+                }
+        }
+        
+        if(mMediaSource)
+        {
+                mMediaSource->setPriority(mVisible?LLPluginClassMedia::PRIORITY_NORMAL:LLPluginClassMedia::PRIORITY_HIDDEN);
+        }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-LLUUID LLViewerMedia::getMediaTextureID()
+void LLViewerMediaImpl::mouseCapture()
 {
-        return sViewerMediaImpl.getMediaTextureID();
+        gFocusMgr.setMouseCapture(this);
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-bool LLViewerMedia::getMediaSize(S32 *media_width, S32 *media_height)
+void LLViewerMediaImpl::getTextureSize(S32 *texture_width, S32 *texture_height)
 {
-        // make sure we're valid
+        if(mMediaSource && mMediaSource->textureValid())
+        {
+                S32 real_texture_width = mMediaSource->getBitsWidth();
+                S32 real_texture_height = mMediaSource->getBitsHeight();
 
-        if ( sViewerMediaImpl.mMediaSource != NULL )
+                {
+                        // The "texture width" coming back from the plugin may not be a power of two (thanks to webkit).
+                        // It will be the correct "data width" to pass to setSubImage
+                        int i;
+                        
+                        for(i = 1; i < real_texture_width; i <<= 1)
+                                ;
+                        *texture_width = i;
+
+                        for(i = 1; i < real_texture_height; i <<= 1)
+                                ;
+                        *texture_height = i;
+                }
+                        
+        }
+        else
         {
-                *media_width = sViewerMediaImpl.mMediaSource->getMediaWidth();
-                *media_height = sViewerMediaImpl.mMediaSource->getMediaHeight();
-                return true;
+                *texture_width = 0;
+                *texture_height = 0;
         }
-        return false;
+}
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::scaleMouse(S32 *mouse_x, S32 *mouse_y)
+{
+#if 0
+        S32 media_width, media_height;
+        S32 texture_width, texture_height;
+        getMediaSize( &media_width, &media_height );
+        getTextureSize( &texture_width, &texture_height );
+        S32 y_delta = texture_height - media_height;
+
+        *mouse_y -= y_delta;
+#endif
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-bool LLViewerMedia::getTextureSize(S32 *texture_width, S32 *texture_height)
+bool LLViewerMediaImpl::isMediaPlaying()
 {
-        if ( sViewerMediaImpl.mMediaSource != NULL )
+        bool result = false;
+        
+        if(mMediaSource)
         {
-                S32 media_width = sViewerMediaImpl.mMediaSource->getMediaWidth();
-                S32 media_height = sViewerMediaImpl.mMediaSource->getMediaHeight();
-                *texture_width = LLMediaManager::textureWidthFromMediaWidth( media_width );
-                *texture_height = LLMediaManager::textureHeightFromMediaHeight( media_height );
-                return true;
+                EMediaStatus status = mMediaSource->getStatus();
+                if(status == MEDIA_PLAYING || status == MEDIA_LOADING)
+                        result = true;
         }
-        return false;
+        
+        return result;
 }
+//////////////////////////////////////////////////////////////////////////////////////////
+bool LLViewerMediaImpl::isMediaPaused()
+{
+        bool result = false;
 
+        if(mMediaSource)
+        {
+                if(mMediaSource->getStatus() == MEDIA_PAUSED)
+                        result = true;
+        }
+        
+        return result;
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-void LLViewerMedia::updateImagesMediaStreams()
+//
+bool LLViewerMediaImpl::hasMedia()
 {
-        sViewerMediaImpl.updateImagesMediaStreams();
+        return mMediaSource != NULL;
 }
+
 //////////////////////////////////////////////////////////////////////////////////////////
-// static
-bool LLViewerMedia::isMediaPlaying()
+void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent event)
 {
-        LLMediaBase::EStatus status = sViewerMediaImpl.getStatus();
-        return (status == LLMediaBase::STATUS_STARTED );
+        switch(event)
+        {
+                case MEDIA_EVENT_PLUGIN_FAILED:
+                {
+                        LLSD args;
+                        args["PLUGIN"] = LLMIMETypes::implType(mMimeType);
+                        LLNotifications::instance().add("MediaPluginFailed", args);
+                }
+                break;
+                default:
+                break;
+        }
+        // Just chain the event to observers.
+        emitEvent(self, event);
 }
-//////////////////////////////////////////////////////////////////////////////////////////
-// static
-bool LLViewerMedia::isMediaPaused()
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+void
+LLViewerMediaImpl::cut()
 {
-        LLMediaBase::EStatus status = sViewerMediaImpl.getStatus();
-        return (status == LLMediaBase::STATUS_PAUSED);
+        if (mMediaSource)
+                mMediaSource->cut();
 }
-//////////////////////////////////////////////////////////////////////////////////////////
-// static
-bool LLViewerMedia::hasMedia()
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+BOOL
+LLViewerMediaImpl::canCut() const
 {
-        return sViewerMediaImpl.mMediaSource != NULL;
+        if (mMediaSource)
+                return mMediaSource->canCut();
+        else
+                return FALSE;
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////
-//static
-bool LLViewerMedia::isActiveMediaTexture(const LLUUID& id)
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+void
+LLViewerMediaImpl::copy()
 {
-        return (id.notNull()
-                && id == getMediaTextureID()
-                && isMediaPlaying());
+        if (mMediaSource)
+                mMediaSource->copy();
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// static
-std::string LLViewerMedia::getMediaURL()
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+BOOL
+LLViewerMediaImpl::canCopy() const
 {
-        return sViewerMediaImpl.mMediaURL;
+        if (mMediaSource)
+                return mMediaSource->canCopy();
+        else
+                return FALSE;
 }
-//////////////////////////////////////////////////////////////////////////////////////////
-// static
-std::string LLViewerMedia::getMimeType()
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+void
+LLViewerMediaImpl::paste()
 {
-        return sViewerMediaImpl.mMimeType;
+        if (mMediaSource)
+                mMediaSource->paste();
 }
-//////////////////////////////////////////////////////////////////////////////////////////
-// static
-void LLViewerMedia::setMimeType(std::string mime_type)
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+BOOL
+LLViewerMediaImpl::canPaste() const
 {
-        sViewerMediaImpl.mMimeType = mime_type;
+        if (mMediaSource)
+                return mMediaSource->canPaste();
+        else
+                return FALSE;
 }
+
diff --git a/linden/indra/newview/llviewermedia.h b/linden/indra/newview/llviewermedia.h
index 600d740..afda426 100644
--- a/linden/indra/newview/llviewermedia.h
+++ b/linden/indra/newview/llviewermedia.h
@@ -33,50 +33,192 @@
 #ifndef LLVIEWERMEDIA_H
 #define LLVIEWERMEDIA_H
 
-#include "llmediabase.h"        // for status codes
+#include "llfocusmgr.h"
 
-class LLMediaManagerData;
+#include "llpanel.h"
+#include "llpluginclassmediaowner.h"
+
+#include "llviewermediaobserver.h"
+
+class LLViewerMediaImpl;
 class LLUUID;
+class LLViewerImage;
+
+typedef LLPointer<LLViewerMediaImpl> viewer_media_t;
+///////////////////////////////////////////////////////////////////////////////
+//
+class LLViewerMediaEventEmitter
+{
+public:
+        virtual ~LLViewerMediaEventEmitter();
+
+        bool addObserver( LLViewerMediaObserver* subject );
+        bool remObserver( LLViewerMediaObserver* subject );
+        void emitEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent event);
+
+private:
+        typedef std::list< LLViewerMediaObserver* > observerListType;
+        observerListType mObservers;
+};
 
 class LLViewerMedia
 {
+        LOG_CLASS(LLViewerMedia);
         public:
                 // Special case early init for just web browser component
                 // so we can show login screen.  See .cpp file for details. JC
-                static void initBrowser();
 
-                static void initClass();
-                static void cleanupClass();
+                static viewer_media_t newMediaImpl(const std::string& media_url,
+                                                                                                const LLUUID& texture_id,
+                                                                                                S32 media_width, 
+                                                                                                S32 media_height, 
+                                                                                                U8 media_auto_scale,
+                                                                                                U8 media_loop,
+                                                                                                std::string mime_type = "none/none");
 
-                static void play(const std::string& media_url,
-                                                 const std::string& mime_type,
-                                                 const LLUUID& placeholder_texture_id,
-                                                 S32 media_width, S32 media_height, U8 media_auto_scale,
-                                                 U8 media_loop);
-                static void stop();
-                static void pause();
-                static void start();
-                static void seek(F32 time);
+                static void removeMedia(LLViewerMediaImpl* media);
+                static LLViewerMediaImpl* getMediaImplFromTextureID(const LLUUID& texture_id);
+                static std::string getCurrentUserAgent();
+                static void updateBrowserUserAgent();
+                static bool handleSkinCurrentChanged(const LLSD& /*newvalue*/);
+                static bool textureHasMedia(const LLUUID& texture_id);
                 static void setVolume(F32 volume);
-                static LLMediaBase::EStatus getStatus();
 
-                static LLUUID getMediaTextureID();
-                static bool getMediaSize(S32 *media_width, S32 *media_height);
-                static bool getTextureSize(S32 *texture_width, S32 *texture_height);
-                static bool isMediaPlaying();
-                static bool isMediaPaused();
-                static bool hasMedia();
-                static bool isActiveMediaTexture(const LLUUID& id);
+                static void updateMedia();
+
+                static void cleanupClass();
+
+};
+
+// Implementation functions not exported into header file
+class LLViewerMediaImpl
+        :       public LLMouseHandler, public LLRefCount, public LLPluginClassMediaOwner, public LLViewerMediaEventEmitter, public LLEditMenuHandler
+{
+        LOG_CLASS(LLViewerMediaImpl);
+public:
+
+        LLViewerMediaImpl(const std::string& media_url,
+                const LLUUID& texture_id,
+                S32 media_width, 
+                S32 media_height, 
+                U8 media_auto_scale,
+                U8 media_loop,
+                const std::string& mime_type);
+
+        ~LLViewerMediaImpl();
+        void createMediaSource();
+        void destroyMediaSource();
+        void setMediaType(const std::string& media_type);
+        bool initializeMedia(const std::string& mime_type);
+        bool initializePlugin(const std::string& media_type);
+        LLPluginClassMedia* getMediaPlugin() { return mMediaSource; }
+        void setSize(int width, int height);
+
+        void play();
+        void stop();
+        void pause();
+        void start();
+        void seek(F32 time);
+        void setVolume(F32 volume);
+        void focus(bool focus);
+        void mouseDown(S32 x, S32 y);
+        void mouseUp(S32 x, S32 y);
+        void mouseMove(S32 x, S32 y);
+        void mouseLeftDoubleClick(S32 x,S32 y );
+        void mouseCapture();
+
+        void navigateHome();
+        void navigateTo(const std::string& url, const std::string& mime_type = "", bool rediscover_type = false);
+        void navigateStop();
+        bool handleKeyHere(KEY key, MASK mask);
+        bool handleUnicodeCharHere(llwchar uni_char);
+        bool canNavigateForward();
+        bool canNavigateBack();
+        std::string getMediaURL() { return mMediaURL; }
+        std::string getMediaHomeURL() { return mHomeURL; }
+        std::string getMimeType() { return mMimeType; }
+        void getTextureSize(S32 *texture_width, S32 *texture_height);
+        void scaleMouse(S32 *mouse_x, S32 *mouse_y);
+
+        void update();
+        void updateMovieImage(const LLUUID& image_id, BOOL active);
+        void updateImagesMediaStreams();
+        LLUUID getMediaTextureID();
+        
+        void suspendUpdates(bool suspend) { mSuspendUpdates = suspend; };
+        void setVisible(bool visible);
+
+        bool isMediaPlaying();
+        bool isMediaPaused();
+        bool hasMedia();
+
+        // utility function to create a ready-to-use media instance from a desired media type.
+        static LLPluginClassMedia* newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height);
+
+        // Internally set our desired browser user agent string, including
+        // the Second Life version and skin name.  Used because we can
+        // switch skins without restarting the app.
+        static void updateBrowserUserAgent();
+
+        // Callback for when the SkinCurrent control is changed to
+        // switch the user agent string to indicate the new skin.
+        static bool handleSkinCurrentChanged(const LLSD& newvalue);
+
+        // need these to handle mouseup...
+        /*virtual*/ void        onMouseCaptureLost();
+        /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
+
+        // Grr... the only thing I want as an LLMouseHandler are the onMouseCaptureLost and handleMouseUp calls.
+        // Sadly, these are all pure virtual, so I have to supply implementations here:
+        /*virtual*/ BOOL        handleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; };
+        /*virtual*/ BOOL        handleHover(S32 x, S32 y, MASK mask) { return FALSE; };
+        /*virtual*/ BOOL        handleScrollWheel(S32 x, S32 y, S32 clicks) { return FALSE; };
+        /*virtual*/ BOOL        handleDoubleClick(S32 x, S32 y, MASK mask) { return FALSE; };
+        /*virtual*/ BOOL        handleRightMouseDown(S32 x, S32 y, MASK mask) { return FALSE; };
+        /*virtual*/ BOOL        handleRightMouseUp(S32 x, S32 y, MASK mask) { return FALSE; };
+        /*virtual*/ BOOL        handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) { return FALSE; };
+        /*virtual*/ BOOL        handleMiddleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; };
+        /*virtual*/ BOOL        handleMiddleMouseUp(S32 x, S32 y, MASK mask) {return FALSE; };
+        /*virtual*/ const std::string& getName() const { return LLStringUtil::null; };
+        /*virtual*/ BOOL isView() const { return FALSE; };
+        /*virtual*/ void        screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {};
+        /*virtual*/ void        localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const {};
+        /*virtual*/ BOOL hasMouseCapture() { return gFocusMgr.getMouseCapture() == this; };
+
+        // Inherited from LLPluginClassMediaOwner
+        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent);
+
+        // LLEditMenuHandler overrides
+        /*virtual*/ void        cut();
+        /*virtual*/ BOOL        canCut() const;
+
+        /*virtual*/ void        copy();
+        /*virtual*/ BOOL        canCopy() const;
 
-                static std::string getMediaURL();
-                static std::string getMimeType();
-                static void setMimeType(std::string mime_type);
+        /*virtual*/ void        paste();
+        /*virtual*/ BOOL        canPaste() const;
+        
+public:
+        // a single media url with some data and an impl.
+        LLPluginClassMedia* mMediaSource;
+        LLUUID mTextureId;
+        bool  mMovieImageHasMips;
+        std::string mMediaURL;
+        std::string mHomeURL;
+        std::string mMimeType;
+        S32 mLastMouseX;        // save the last mouse coord we get, so when we lose capture we can simulate a mouseup at that point.
+        S32 mLastMouseY;
+        S32 mMediaWidth;
+        S32 mMediaHeight;
+        bool mMediaAutoScale;
+        bool mMediaLoop;
+        bool mNeedsNewTexture;
+        bool mSuspendUpdates;
+        bool mVisible;
 
-                static void updateImagesMediaStreams();
 
-        private:
-                // Fill in initialization data for LLMediaManager::initClass()
-                static void buildMediaManagerData( LLMediaManagerData* init_data );
+private:
+        LLViewerImage *updatePlaceholderImage();
 };
 
 #endif  // LLVIEWERMEDIA_H
diff --git a/linden/indra/newview/llviewermedia_streamingaudio.cpp b/linden/indra/newview/llviewermedia_streamingaudio.cpp
new file mode 100644
index 0000000..06946da
--- /dev/null
+++ b/linden/indra/newview/llviewermedia_streamingaudio.cpp
@@ -0,0 +1,169 @@
+/** 
+ * @file llviewermedia_streamingaudio.h
+ * @author Tofu Linden, Sam Kolb
+ * @brief LLStreamingAudio_MediaPlugins implementation - an implementation of the streaming audio interface which is implemented as a client of the media plugins API.
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "linden_common.h"
+#include "llpluginclassmedia.h"
+#include "llviewermedia.h"
+
+#include "llviewermedia_streamingaudio.h"
+
+#include "llmimetypes.h"
+#include "llvfs.h"
+#include "lldir.h"
+
+
+LLStreamingAudio_MediaPlugins::LLStreamingAudio_MediaPlugins() :
+        mMediaPlugin(NULL),
+        mGain(1.0)
+{
+        // nothing interesting to do?
+        // we will lazily create a media plugin at play-time, if none exists.
+}
+
+LLStreamingAudio_MediaPlugins::~LLStreamingAudio_MediaPlugins()
+{
+        delete mMediaPlugin;
+        mMediaPlugin = NULL;
+}
+
+void LLStreamingAudio_MediaPlugins::start(const std::string& url)
+{
+        if (!mMediaPlugin) // lazy-init the underlying media plugin
+        {
+                mMediaPlugin = initializeMedia("audio/mpeg"); // assumes that whatever media implementation supports mp3 also supports vorbis.
+                llinfos << "mMediaPlugin is now " << mMediaPlugin << llendl;
+        }
+
+        if(!mMediaPlugin)
+                return;
+        
+        if (!url.empty()) {
+                llinfos << "Starting internet stream: " << url << llendl;
+                mURL = url;
+                mMediaPlugin->loadURI ( url );
+                mMediaPlugin->start();
+                llinfos << "Playing....." << llendl;            
+        } else {
+                llinfos << "setting stream to NULL"<< llendl;
+                mURL.clear();
+                mMediaPlugin->stop();
+        }
+}
+
+void LLStreamingAudio_MediaPlugins::stop()
+{
+        if(mMediaPlugin)
+        {
+                mMediaPlugin->stop();
+        }
+
+        mURL.clear();
+}
+
+void LLStreamingAudio_MediaPlugins::pause(int pause)
+{
+        if(!mMediaPlugin)
+                return;
+        
+        if(pause)
+        {
+                mMediaPlugin->pause();
+        } 
+        else 
+        {
+                mMediaPlugin->start();
+        }
+}
+
+void LLStreamingAudio_MediaPlugins::update()
+{
+        if (mMediaPlugin)
+                mMediaPlugin->idle();
+}
+
+int LLStreamingAudio_MediaPlugins::isPlaying()
+{
+        if (!mMediaPlugin)
+                return 0;
+        
+        // *TODO: can probably do better than this
+        if (mMediaPlugin->isPluginRunning())
+        {
+                return 1; // Active and playing
+        }       
+
+        if (mMediaPlugin->isPluginExited())
+        {
+                return 0; // stopped
+        }
+
+        return 2; // paused
+}
+
+void LLStreamingAudio_MediaPlugins::setGain(F32 vol)
+{
+        mGain = vol;
+
+        if(!mMediaPlugin)
+                return;
+
+        vol = llclamp(vol, 0.f, 1.f);
+        mMediaPlugin->setVolume(vol);
+}
+
+F32 LLStreamingAudio_MediaPlugins::getGain()
+{
+        return mGain;
+}
+
+std::string LLStreamingAudio_MediaPlugins::getURL()
+{
+        return mURL;
+}
+
+LLPluginClassMedia* LLStreamingAudio_MediaPlugins::initializeMedia(const std::string& media_type)
+{
+        LLPluginClassMediaOwner* owner = NULL;
+        S32 default_size = 1; // audio-only - be minimal, doesn't matter
+        LLPluginClassMedia* media_source = LLViewerMediaImpl::newSourceFromMediaType(media_type, owner, default_size, default_size);
+
+        if (media_source)
+        {
+                media_source->setLoop(false); // audio streams are not expected to loop
+        }
+
+        return media_source;
+}
+
diff --git a/linden/indra/newview/llviewermedia_streamingaudio.h b/linden/indra/newview/llviewermedia_streamingaudio.h
new file mode 100644
index 0000000..270bab7
--- /dev/null
+++ b/linden/indra/newview/llviewermedia_streamingaudio.h
@@ -0,0 +1,69 @@
+/** 
+ * @file llviewermedia_streamingaudio.h
+ * @author Tofu Linden
+ * @brief Definition of LLStreamingAudio_MediaPlugins implementation - an implementation of the streaming audio interface which is implemented as a client of the media plugins API.
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_VIEWERMEDIA_STREAMINGAUDIO_H
+#define LL_VIEWERMEDIA_STREAMINGAUDIO_H
+
+
+#include "stdtypes.h" // from llcommon
+
+#include "llstreamingaudio.h"
+
+class LLPluginClassMedia;
+
+class LLStreamingAudio_MediaPlugins : public LLStreamingAudioInterface
+{
+ public:
+        LLStreamingAudio_MediaPlugins();
+        /*virtual*/ ~LLStreamingAudio_MediaPlugins();
+
+        /*virtual*/ void start(const std::string& url);
+        /*virtual*/ void stop();
+        /*virtual*/ void pause(int pause);
+        /*virtual*/ void update();
+        /*virtual*/ int isPlaying();
+        /*virtual*/ void setGain(F32 vol);
+        /*virtual*/ F32 getGain();
+        /*virtual*/ std::string getURL();
+
+private:
+        LLPluginClassMedia* initializeMedia(const std::string& media_type);
+
+        LLPluginClassMedia *mMediaPlugin;
+
+        std::string mURL;
+        F32 mGain;
+};
+
+
+#endif //LL_VIEWERMEDIA_STREAMINGAUDIO_H
diff --git a/linden/indra/newview/llviewermediafocus.cpp b/linden/indra/newview/llviewermediafocus.cpp
new file mode 100644
index 0000000..2e372a1
--- /dev/null
+++ b/linden/indra/newview/llviewermediafocus.cpp
@@ -0,0 +1,359 @@
+/** 
+ * @file llviewermediafocus.cpp
+ * @brief Governs focus on Media prims
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llviewermediafocus.h"
+
+//LLViewerMediaFocus
+#include "llviewerobjectlist.h"
+#include "llpanelmediahud.h"
+#include "llpluginclassmedia.h"
+#include "llagent.h"
+#include "lltoolpie.h"
+#include "llviewercamera.h"
+#include "llviewermedia.h"
+#include "llhudview.h"
+#include "lluictrlfactory.h"
+#include "lldrawable.h"
+#include "llparcel.h"
+#include "llviewerparcelmgr.h"
+#include "llweb.h"
+//
+// LLViewerMediaFocus
+//
+
+LLViewerMediaFocus::LLViewerMediaFocus()
+: mMouseOverFlag(false)
+{
+}
+
+LLViewerMediaFocus::~LLViewerMediaFocus()
+{
+        // The destructor for LLSingletons happens at atexit() time, which is too late to do much.
+        // Clean up in cleanupClass() instead.
+}
+
+void LLViewerMediaFocus::cleanupClass()
+{
+        LLViewerMediaFocus *self = LLViewerMediaFocus::getInstance();
+        
+        if(self)
+        {
+                // mMediaHUD will have been deleted by this point -- don't try to delete it.
+
+                /* Richard says:
+                        all widgets are supposed to be destroyed at the same time
+                        you shouldn't hold on to pointer to them outside of ui code             
+                        you can use the LLHandle approach
+                        if you want to be type safe, you'll need to add a LLRootHandle to whatever derived class you are pointing to
+                        look at llview::gethandle
+                        its our version of a weak pointer                       
+                */
+                if(self->mMediaHUD.get())
+                {
+                        self->mMediaHUD.get()->setMediaImpl(NULL);
+                }
+                self->mMediaImpl = NULL;
+        }
+        
+}
+
+
+void LLViewerMediaFocus::setFocusFace( BOOL b, LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl )
+{
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if (b && media_impl.notNull())
+        {
+                mMediaImpl = media_impl;
+                LLSelectMgr::getInstance()->deselectAll();
+                LLSelectMgr::getInstance()->selectObjectOnly(objectp, face);
+
+                mFocus = LLSelectMgr::getInstance()->getSelection();
+                if(mMediaHUD.get() && ! parcel->getMediaPreventCameraZoom())
+                {
+                        mMediaHUD.get()->resetZoomLevel();
+                        mMediaHUD.get()->nextZoomLevel();
+                }
+                if (!mFocus->isEmpty())
+                {
+                        gFocusMgr.setKeyboardFocus(this);
+                }
+                mObjectID = objectp->getID();
+                // LLViewerMedia::addObserver(this, mObjectID);
+
+
+        }
+        else
+        {
+                gFocusMgr.setKeyboardFocus(NULL);
+                if(! parcel->getMediaPreventCameraZoom())
+                {
+                        if (!mFocus->isEmpty())
+                        {
+                                gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+                        }
+                }
+                mFocus = NULL;
+                // LLViewerMedia::remObserver(this, mObjectID);
+                
+                // Null out the media hud media pointer
+                if(mMediaHUD.get())
+                {
+                        mMediaHUD.get()->setMediaImpl(NULL);
+                }
+
+                // and null out the media impl
+                mMediaImpl = NULL;
+        }
+        if(mMediaHUD.get())
+        {
+                mMediaHUD.get()->setMediaFocus(b);
+        }
+}
+bool LLViewerMediaFocus::getFocus()
+{
+        if (gFocusMgr.getKeyboardFocus() == this)
+        {
+                return true;
+        }
+        return false;
+}
+
+// This function selects an ideal viewing distance given a selection bounding box, normal, and padding value
+void LLViewerMediaFocus::setCameraZoom(F32 padding_factor)
+{
+        LLPickInfo& pick = LLToolPie::getInstance()->getPick();
+
+        if(LLSelectMgr::getInstance()->getSelection()->isEmpty())
+        {
+                pick = mPickInfo;
+                setFocusFace(true, pick.getObject(), pick.mObjectFace, mMediaImpl);
+        }
+
+        if (!LLSelectMgr::getInstance()->getSelection()->isEmpty())
+        {
+                gAgent.setFocusOnAvatar(FALSE, ANIMATE);
+
+                LLBBox selection_bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
+                F32 height;
+                F32 width;
+                F32 depth;
+                F32 angle_of_view;
+                F32 distance;
+
+                // We need the aspect ratio, and the 3 components of the bbox as height, width, and depth.
+                F32 aspect_ratio = getBBoxAspectRatio(selection_bbox, pick.mNormal, &height, &width, &depth);
+                F32 camera_aspect = LLViewerCamera::getInstance()->getAspect();
+
+                // We will normally use the side of the volume aligned with the short side of the screen (i.e. the height for 
+                // a screen in a landscape aspect ratio), however there is an edge case where the aspect ratio of the object is 
+                // more extreme than the screen.  In this case we invert the logic, using the longer component of both the object
+                // and the screen.  
+                bool invert = (camera_aspect > 1.0f && aspect_ratio > camera_aspect) ||
+                        (camera_aspect < 1.0f && aspect_ratio < camera_aspect);
+
+                // To calculate the optimum viewing distance we will need the angle of the shorter side of the view rectangle.
+                // In portrait mode this is the width, and in landscape it is the height.
+                // We then calculate the distance based on the corresponding side of the object bbox (width for portrait, height for landscape)
+                // We will add half the depth of the bounding box, as the distance projection uses the center point of the bbox.
+                if(camera_aspect < 1.0f || invert)
+                {
+                        angle_of_view = llmax(0.1f, LLViewerCamera::getInstance()->getView() * LLViewerCamera::getInstance()->getAspect());
+                        distance = width * 0.5 * padding_factor / tan(angle_of_view * 0.5f );
+                }
+                else
+                {
+                        angle_of_view = llmax(0.1f, LLViewerCamera::getInstance()->getView());
+                        distance = height * 0.5 * padding_factor / tan(angle_of_view * 0.5f );
+                }
+
+                distance += depth * 0.5;
+
+                // Finally animate the camera to this new position and focal point
+                gAgent.setCameraPosAndFocusGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal() + LLVector3d(pick.mNormal * distance), 
+                        LLSelectMgr::getInstance()->getSelectionCenterGlobal(), LLSelectMgr::getInstance()->getSelection()->getFirstObject()->mID );
+        }
+}
+void LLViewerMediaFocus::onFocusReceived()
+{
+        if(mMediaImpl.notNull())
+                mMediaImpl->focus(true);
+
+        LLFocusableElement::onFocusReceived();
+}
+
+void LLViewerMediaFocus::onFocusLost()
+{
+        if(mMediaImpl.notNull())
+                mMediaImpl->focus(false);
+        gViewerWindow->focusClient();
+        mFocus = NULL;
+        LLFocusableElement::onFocusLost();
+}
+void LLViewerMediaFocus::setMouseOverFlag(bool b, viewer_media_t media_impl)
+{
+        if (b && media_impl.notNull())
+        {
+                if(! mMediaHUD.get())
+                {
+                        LLPanelMediaHUD* media_hud = new LLPanelMediaHUD(mMediaImpl);
+                        mMediaHUD = media_hud->getHandle();
+                        gHUDView->addChild(media_hud);  
+                }
+                mMediaHUD.get()->setMediaImpl(media_impl);
+                mMediaImpl = media_impl;
+        }
+        mMouseOverFlag = b;
+}
+LLUUID LLViewerMediaFocus::getSelectedUUID() 
+{ 
+        LLViewerObject* object = mFocus->getFirstObject();
+        return object ? object->getID() : LLUUID::null; 
+}
+#if 0 // Must re-implement when the new media api event system is ready
+void LLViewerMediaFocus::onNavigateComplete( const EventType& event_in )
+{
+        if (hasFocus() && mLastURL != event_in.getStringValue())
+        {
+                LLViewerMedia::focus(true, mObjectID);
+                // spoof mouse event to reassert focus
+                LLViewerMedia::mouseDown(1,1, mObjectID);
+                LLViewerMedia::mouseUp(1,1, mObjectID);
+        }
+        mLastURL = event_in.getStringValue();
+}
+#endif
+BOOL LLViewerMediaFocus::handleKey(KEY key, MASK mask, BOOL called_from_parent)
+{
+        if(mMediaImpl.notNull())
+                mMediaImpl->handleKeyHere(key, mask);
+        return true;
+}
+
+BOOL LLViewerMediaFocus::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
+{
+        if(mMediaImpl.notNull())
+                mMediaImpl->handleUnicodeCharHere(uni_char);
+        return true;
+}
+BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        BOOL retval = FALSE;
+        if(mFocus.notNull() && mMediaImpl.notNull() && mMediaImpl->hasMedia())
+        {
+                mMediaImpl->getMediaPlugin()->scrollEvent(x, y, clicks);
+                retval = TRUE;
+        }
+        return retval;
+}
+
+void LLViewerMediaFocus::update()
+{
+        if (mMediaHUD.get())
+        {
+                if(mFocus.notNull() || mMouseOverFlag || mMediaHUD.get()->isMouseOver())
+                {
+                        // mMediaHUD.get()->setVisible(true);
+                        mMediaHUD.get()->updateShape();
+                }
+                else
+                {
+                        mMediaHUD.get()->setVisible(false);
+                }
+        }
+}
+// This function calculates the aspect ratio and the world aligned components of a selection bounding box.
+F32 LLViewerMediaFocus::getBBoxAspectRatio(const LLBBox& bbox, const LLVector3& normal, F32* height, F32* width, F32* depth)
+{
+        // Convert the selection normal and an up vector to local coordinate space of the bbox
+        LLVector3 local_normal = bbox.agentToLocalBasis(normal);
+        LLVector3 z_vec = bbox.agentToLocalBasis(LLVector3(0.0f, 0.0f, 1.0f));
+        
+        LLVector3 comp1(0.f,0.f,0.f);
+        LLVector3 comp2(0.f,0.f,0.f);
+        LLVector3 bbox_max = bbox.getExtentLocal();
+        F32 dot1 = 0.f;
+        F32 dot2 = 0.f;
+
+        // The largest component of the localized normal vector is the depth component
+        // meaning that the other two are the legs of the rectangle.
+        local_normal.abs();
+        if(local_normal.mV[VX] > local_normal.mV[VY])
+        {
+                if(local_normal.mV[VX] > local_normal.mV[VZ])
+                {
+                        // Use the y and z comps
+                        comp1.mV[VY] = bbox_max.mV[VY];
+                        comp2.mV[VZ] = bbox_max.mV[VZ];
+                        *depth = bbox_max.mV[VX];
+                }
+                else
+                {
+                        // Use the x and y comps
+                        comp1.mV[VY] = bbox_max.mV[VY];
+                        comp2.mV[VZ] = bbox_max.mV[VZ];
+                        *depth = bbox_max.mV[VZ];
+                }
+        }
+        else if(local_normal.mV[VY] > local_normal.mV[VZ])
+        {
+                // Use the x and z comps
+                comp1.mV[VX] = bbox_max.mV[VX];
+                comp2.mV[VZ] = bbox_max.mV[VZ];
+                *depth = bbox_max.mV[VY];
+        }
+        else
+        {
+                // Use the x and y comps
+                comp1.mV[VY] = bbox_max.mV[VY];
+                comp2.mV[VZ] = bbox_max.mV[VZ];
+                *depth = bbox_max.mV[VX];
+        }
+        
+        // The height is the vector closest to vertical in the bbox coordinate space (highest dot product value)
+        dot1 = comp1 * z_vec;
+        dot2 = comp2 * z_vec;
+        if(fabs(dot1) > fabs(dot2))
+        {
+                *height = comp1.length();
+                *width = comp2.length();
+        }
+        else
+        {
+                *height = comp2.length();
+                *width = comp1.length();
+        }
+
+        // Return the aspect ratio.
+        return *width / *height;
+}
diff --git a/linden/indra/newview/llviewermediafocus.h b/linden/indra/newview/llviewermediafocus.h
new file mode 100644
index 0000000..ed9597e
--- /dev/null
+++ b/linden/indra/newview/llviewermediafocus.h
@@ -0,0 +1,91 @@
+/** 
+ * @file llpanelmsgs.h
+ * @brief Message popup preferences panel
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_VIEWERMEDIAFOCUS_H
+#define LL_VIEWERMEDIAFOCUS_H
+
+// includes for LLViewerMediaFocus
+#include "llfocusmgr.h"
+#include "llviewermedia.h"
+#include "llviewerobject.h"
+#include "llviewerwindow.h"
+#include "llselectmgr.h"
+
+class LLViewerMediaImpl;
+class LLPanelMediaHUD;
+
+class LLViewerMediaFocus : 
+        public LLFocusableElement, 
+        public LLSingleton<LLViewerMediaFocus>
+{
+public:
+        LLViewerMediaFocus();
+        ~LLViewerMediaFocus();
+        
+        static void cleanupClass();
+
+        void setFocusFace(BOOL b, LLPointer<LLViewerObject> objectp, S32 face, viewer_media_t media_impl);
+        void clearFocus() { setFocusFace(false, NULL, 0, NULL); }
+        /*virtual*/ bool        getFocus();
+        /*virtual*/ // void onNavigateComplete( const EventType& event_in );
+
+        /*virtual*/ BOOL        handleKey(KEY key, MASK mask, BOOL called_from_parent);
+        /*virtual*/ BOOL        handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
+        BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+
+        LLUUID getSelectedUUID();
+        LLObjectSelectionHandle getSelection() { return mFocus; }
+
+        void update();
+
+        void setCameraZoom(F32 padding_factor);
+        void setMouseOverFlag(bool b, viewer_media_t media_impl = NULL);
+        bool getMouseOverFlag() { return mMouseOverFlag; }
+        void setPickInfo(LLPickInfo pick_info) { mPickInfo = pick_info; }
+        F32 getBBoxAspectRatio(const LLBBox& bbox, const LLVector3& normal, F32* height, F32* width, F32* depth);
+
+protected:
+        /*virtual*/ void        onFocusReceived();
+        /*virtual*/ void        onFocusLost();
+
+private:
+        LLObjectSelectionHandle mFocus;
+        std::string mLastURL;
+        bool mMouseOverFlag;
+        LLPickInfo mPickInfo;
+        LLHandle<LLPanelMediaHUD> mMediaHUD;
+        LLUUID mObjectID;
+        viewer_media_t mMediaImpl;
+};
+
+
+#endif // LL_VIEWERMEDIAFOCUS_H
diff --git a/linden/indra/llmedia/llmediaimplexample1.h b/linden/indra/newview/llviewermediaobserver.h
index 1b90e93..6667f98 100644
--- a/linden/indra/llmedia/llmediaimplexample1.h
+++ b/linden/indra/newview/llviewermediaobserver.h
@@ -1,6 +1,6 @@
 /**
- * @file llmediaimplexample1.h
- * @brief Example 1 of a media impl concrete class
+ * @file llviewermediaobserver.h
+ * @brief Methods to override to catch events from LLViewerMedia class
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
@@ -30,44 +30,42 @@
  * $/LicenseInfo$
  */
 
-#ifndef LLMEDIAIMPLEXAMPLE1_H
-#define LLMEDIAIMPLEXAMPLE1_H
+#ifndef LLVIEWERMEDIAOBSERVER_H
+#define LLVIEWERMEDIAOBSERVER_H
 
-#include "llmediaimplcommon.h"
-#include "llmediaimplfactory.h"
+#include "llpluginclassmediaowner.h"
 
-class  LLMediaManagerData;
+class LLViewerMediaEventEmitter;
 
-class LLMediaImplExample1 :
-        public LLMediaImplCommon
+class LLViewerMediaObserver : public LLPluginClassMediaOwner
 {
-        public:
-                LLMediaImplExample1();
+public:
+        virtual ~LLViewerMediaObserver();
+        
+private:
+        // Emitters will manage this list in addObserver/remObserver.
+        friend class LLViewerMediaEventEmitter;
+        std::list<LLViewerMediaEventEmitter *> mEmitters;
+};
 
-                static bool startup( LLMediaManagerData* init_data );
-                static bool closedown();
 
-                /* virtual */ bool init();
-                /* virtual */ bool navigateTo( const std::string url );
-                /* virtual */ bool updateMedia();
-                /* virtual */ std::string getVersion();
-                /* virtual */ unsigned char* getMediaData();
-                /* virtual */ bool reset();
-                /* virtual */ bool mouseMove( int x_pos, int y_pos );
-                /* virtual */ bool setRequestedMediaSize( int width, int height );
+#if 0
+        // Classes that inherit from LLViewerMediaObserver should add this to their class declaration:
+        
+        // inherited from LLViewerMediaObserver
+        /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+        
+        /* and will probably need to add this to their cpp file:
 
-        private:
-                unsigned char* mMediaPixels;
-};
+        #include "llpluginclassmedia.h"
 
-class LLMediaImplExample1Maker : public LLMediaImplMaker
-{
-        public:
-                LLMediaImplExample1Maker();
-                LLMediaImplExample1* create()
-                {
-                        return new LLMediaImplExample1();
-                }
-};
+        */
+        
+        // The list of events is in llpluginclassmediaowner.h
+        
+        
+#endif
+
+
+#endif // LLVIEWERMEDIAOBSERVER_H
 
-#endif  // LLMEDIAIMPLEXAMPLE1_H
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*)
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 364dcfd..d3473df 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -66,7 +66,7 @@
 #include "llstring.h"
 #include "lltransactiontypes.h"
 #include "lluuid.h"
-#include "vorbisencode.h"
+#include "llvorbisencode.h"
 
 // system libraries
 #include <boost/tokenizer.hpp>
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index bfd1045..9f6ae3d 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -37,7 +37,7 @@
 
 #include <deque>
 
-#include "audioengine.h" 
+#include "llaudioengine.h" 
 #include "indra_constants.h"
 #include "lscript_byteformat.h"
 #include "mean_collision_data.h"
@@ -972,7 +972,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                 LL_DEBUGS("Messaging") << "Highlighting" << item->getUUID()  << LL_ENDL;
                 //highlight item
 
-                LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                LLFocusableElement* focus_ctrl = gFocusMgr.getKeyboardFocus();
                 view->getPanel()->setSelection(item->getUUID(), TAKE_FOCUS_NO);
                 gFocusMgr.setKeyboardFocus(focus_ctrl);
         }
@@ -5197,11 +5197,11 @@ void mean_name_callback(const LLUUID &id, const std::string& first, const std::s
                 return;
         }
 
-        static const int max_collision_list_size = 20;
+        static const U32 max_collision_list_size = 20;
         if (gMeanCollisionList.size() > max_collision_list_size)
         {
                 mean_collision_list_t::iterator iter = gMeanCollisionList.begin();
-                for (S32 i=0; i<max_collision_list_size; i++) iter++;
+                for (U32 i=0; i<max_collision_list_size; i++) iter++;
                 for_each(iter, gMeanCollisionList.end(), DeletePointer());
                 gMeanCollisionList.erase(iter, gMeanCollisionList.end());
         }
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index a854583..b40d4e0 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -34,7 +34,7 @@
 
 #include "llviewerobject.h"
 
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "imageids.h"
 #include "indra_constants.h"
 #include "llmath.h"
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index b98f418..c7f0c4b 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -41,47 +41,22 @@
 #include "llviewerparcelmgr.h"
 #include "lluuid.h"
 #include "message.h"
+#include "llviewermediafocus.h"
 #include "llviewerparcelmediaautoplay.h"
 #include "llviewerwindow.h"
 #include "llfirstuse.h"
+#include "llpluginclassmedia.h"
 
 // Static Variables
 
 S32 LLViewerParcelMedia::sMediaParcelLocalID = 0;
 LLUUID LLViewerParcelMedia::sMediaRegionID;
+viewer_media_t LLViewerParcelMedia::sMediaImpl;
+
 
 // Local functions
 bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel);
 
-// Move this to its own file.
-// helper class that tries to download a URL from a web site and calls a method
-// on the Panel Land Media and to discover the MIME type
-class LLMimeDiscoveryResponder : public LLHTTPClient::Responder
-{
-public:
-        LLMimeDiscoveryResponder( )
-          {}
-
-
-
-          virtual void completedHeader(U32 status, const std::string& reason, const LLSD& content)
-          {
-                  std::string media_type = content["content-type"].asString();
-                  std::string::size_type idx1 = media_type.find_first_of(";");
-                  std::string mime_type = media_type.substr(0, idx1);
-                  completeAny(status, mime_type);
-          }
-
-          virtual void error( U32 status, const std::string& reason )
-          {
-                  completeAny(status, "none/none");
-          }
-
-          void completeAny(U32 status, const std::string& mime_type)
-          {
-                  LLViewerMedia::setMimeType(mime_type);
-          }
-};
 
 // static
 void LLViewerParcelMedia::initClass()
@@ -92,6 +67,13 @@ void LLViewerParcelMedia::initClass()
         LLViewerParcelMediaAutoPlay::initClass();
 }
 
+//static 
+void LLViewerParcelMedia::cleanupClass()
+{
+        // This needs to be destroyed before global destructor time.
+        sMediaImpl = NULL;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 void LLViewerParcelMedia::update(LLParcel* parcel)
@@ -105,6 +87,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
                         {
                                 sMediaRegionID = LLUUID() ;
                                 stop() ;
+                                LL_DEBUGS("Media") << "no agent region, bailing out." << LL_ENDL;
                                 return ;                                
                         }
 
@@ -115,64 +98,54 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
                         LLUUID regionid = gAgent.getRegion()->getRegionID();
                         if (parcelid != sMediaParcelLocalID || regionid != sMediaRegionID)
                         {
+                                LL_DEBUGS("Media") << "New parcel, parcel id = " << parcelid << ", region id = " << regionid << LL_ENDL;
                                 sMediaParcelLocalID = parcelid;
                                 sMediaRegionID = regionid;
                                 new_parcel = true;
                         }
 
                         std::string mediaUrl = std::string ( parcel->getMediaURL () );
+                        std::string mediaCurrentUrl = std::string( parcel->getMediaCurrentURL());
+
+                        // First use warning
+                        if(     ! mediaUrl.empty() && gSavedSettings.getWarning("FirstStreamingVideo") )
+                        {
+                                LLNotifications::instance().add("ParcelCanPlayMedia", LLSD(), LLSD(),
+                                        boost::bind(callback_play_media, _1, _2, parcel));
+                                return;
+
+                        }
+
+                        // if we have a current (link sharing) url, use it instead
+                        if (mediaCurrentUrl != "" && parcel->getMediaType() == "text/html")
+                        {
+                                mediaUrl = mediaCurrentUrl;
+                        }
+                        
                         LLStringUtil::trim(mediaUrl);
+                        
+                        // If no parcel media is playing, nothing left to do
+                        if(sMediaImpl.isNull())
 
-                        // has something changed?
-                        if (  ( LLViewerMedia::getMediaURL() != mediaUrl )
-                                || ( LLViewerMedia::getMediaTextureID() != parcel->getMediaID () ) )
                         {
-                                bool video_was_playing = FALSE;
-                                bool same_media_id = LLViewerMedia::getMediaTextureID() == parcel->getMediaID ();
+                                return;
+                        }
 
-                                if (LLViewerMedia::isMediaPlaying())
+                        // Media is playing...has something changed?
+                        else if (( sMediaImpl->getMediaURL() != mediaUrl )
+                                || ( sMediaImpl->getMediaTextureID() != parcel->getMediaID() )
+                                || ( sMediaImpl->getMimeType() != parcel->getMediaType() ))
+                        {
+                                // Only play if the media types are the same.
+                                if(sMediaImpl->getMimeType() == parcel->getMediaType())
                                 {
-                                        video_was_playing = TRUE;
+                                        play(parcel);
                                 }
 
-                                if ( !mediaUrl.empty() && same_media_id && ! new_parcel)
-                                {
-                                        // Someone has "changed the channel", changing the URL of a video
-                                        // you were already watching.  Automatically play provided the texture ID is the same
-                                        if (video_was_playing)
-                                        {
-                                                // Poke the mime type in before calling play.
-                                                // This is necessary because in this instance we are not waiting
-                                                // for the results of a header curl.  In order to change the channel
-                                                // a mime type MUST be provided.
-                                                LLViewerMedia::setMimeType(parcel->getMediaType());
-                                                play(parcel);
-                                        }
-                                }
                                 else
                                 {
                                         stop();
                                 }
-
-                                // Discover the MIME type
-                                // Disabled for the time being.  Get the mime type from the parcel.
-                                if(gSavedSettings.getBOOL("AutoMimeDiscovery"))
-                                {
-                                        LLHTTPClient::getHeaderOnly( mediaUrl, new LLMimeDiscoveryResponder());
-                                }
-                                else
-                                {
-                                        LLViewerMedia::setMimeType(parcel->getMediaType());
-                                }
-
-                                // First use warning
-                                if(     gSavedSettings.getWarning("FirstStreamingVideo") )
-                                {
-                                        LLNotifications::instance().add("ParcelCanPlayMedia", LLSD(), LLSD(),
-                                                boost::bind(callback_play_media, _1, _2, parcel));
-
-                                }
-
                         }
                 }
                 else
@@ -183,7 +156,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
         /*
         else
         {
-                // no audio player, do a first use dialog if their is media here
+                // no audio player, do a first use dialog if there is media here
                 if (parcel)
                 {
                         std::string mediaUrl = std::string ( parcel->getMediaURL () );
@@ -212,15 +185,54 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
                 return;
 
         std::string media_url = parcel->getMediaURL();
+        std::string media_current_url = parcel->getMediaCurrentURL();
         std::string mime_type = parcel->getMediaType();
         LLUUID placeholder_texture_id = parcel->getMediaID();
         U8 media_auto_scale = parcel->getMediaAutoScale();
         U8 media_loop = parcel->getMediaLoop();
         S32 media_width = parcel->getMediaWidth();
         S32 media_height = parcel->getMediaHeight();
-        LLViewerMedia::play(media_url, mime_type, placeholder_texture_id,
-                                                media_width, media_height, media_auto_scale,
-                                                media_loop);
+
+        if(sMediaImpl)
+        {
+                // If the url and mime type are the same, call play again
+                if(sMediaImpl->getMediaURL() == media_url 
+                        && sMediaImpl->getMimeType() == mime_type
+                        && sMediaImpl->getMediaTextureID() == placeholder_texture_id)
+                {
+                        LL_DEBUGS("Media") << "playing with existing url " << media_url << LL_ENDL;
+
+                        sMediaImpl->play();
+                }
+                // Else if the texture id's are the same, navigate and rediscover type
+                // MBW -- This causes other state from the previous parcel (texture size, autoscale, and looping) to get re-used incorrectly.
+                // It's also not really necessary -- just creating a new instance is fine.
+//              else if(sMediaImpl->getMediaTextureID() == placeholder_texture_id)
+//              {
+//                      sMediaImpl->navigateTo(media_url, mime_type, true);
+//              }
+                else
+                {
+                        // Since the texture id is different, we need to generate a new impl
+                        LL_DEBUGS("Media") << "new media impl with mime type " << mime_type << ", url " << media_url << LL_ENDL;
+
+                        // Delete the old one first so they don't fight over the texture.
+                        sMediaImpl->stop();
+
+                        sMediaImpl = LLViewerMedia::newMediaImpl(media_url, placeholder_texture_id,
+                                media_width, media_height, media_auto_scale,
+                                media_loop);
+                }
+        }
+        else
+        {
+                // There is no media impl, make a new one
+                sMediaImpl = LLViewerMedia::newMediaImpl(media_url, placeholder_texture_id,
+                        media_width, media_height, media_auto_scale,
+                        media_loop);
+        }
+
+        
         LLFirstUse::useMedia();
 
         LLViewerParcelMediaAutoPlay::playStarted();
@@ -229,20 +241,38 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
 // static
 void LLViewerParcelMedia::stop()
 {
+        if(sMediaImpl.isNull())
+        {
+                return;
+        }
+        
+        // We need to remove the media HUD if it is up.
+        LLViewerMediaFocus::getInstance()->clearFocus();
 
-        LLViewerMedia::stop();
+        // This will kill the media instance.
+        sMediaImpl->stop();
+        sMediaImpl = NULL;
 }
 
 // static
 void LLViewerParcelMedia::pause()
 {
-        LLViewerMedia::pause();
+        if(sMediaImpl.isNull())
+        {
+                return;
+        }
+        sMediaImpl->pause();
 }
 
 // static
 void LLViewerParcelMedia::start()
 {
-        LLViewerMedia::start();
+        if(sMediaImpl.isNull())
+        {
+                return;
+        }
+        sMediaImpl->start();
+
         LLFirstUse::useMedia();
 
         LLViewerParcelMediaAutoPlay::playStarted();
@@ -251,16 +281,41 @@ void LLViewerParcelMedia::start()
 // static
 void LLViewerParcelMedia::seek(F32 time)
 {
-        LLViewerMedia::seek(time);
+        if(sMediaImpl.isNull())
+        {
+                return;
+        }
+        sMediaImpl->seek(time);
 }
 
-
 // static
-LLMediaBase::EStatus LLViewerParcelMedia::getStatus()
+void LLViewerParcelMedia::focus(bool focus)
 {
-        return LLViewerMedia::getStatus();
+        sMediaImpl->focus(focus);
+}
+
+// static
+LLViewerMediaImpl::EMediaStatus LLViewerParcelMedia::getStatus()
+{       
+        LLViewerMediaImpl::EMediaStatus result = LLViewerMediaImpl::MEDIA_NONE;
+        
+        if(sMediaImpl.notNull() && sMediaImpl->hasMedia())
+        {
+                result = sMediaImpl->getMediaPlugin()->getStatus();
+        }
+        
+        return result;
 }
 
+// static
+std::string LLViewerParcelMedia::getMimeType()
+{
+        return sMediaImpl.notNull() ? sMediaImpl->getMimeType() : "none/none";
+}
+viewer_media_t LLViewerParcelMedia::getParcelMedia()
+{
+        return sMediaImpl;
+}
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg, void ** )
@@ -298,7 +353,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
                 if(( command == PARCEL_MEDIA_COMMAND_PLAY ) ||
                    ( command == PARCEL_MEDIA_COMMAND_LOOP ))
                 {
-                        if (LLViewerMedia::isMediaPaused())
+                        if (getStatus() == LLViewerMediaImpl::MEDIA_PAUSED)
                         {
                                 start();
                         }
@@ -318,7 +373,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
 
         if (flags & (1<<PARCEL_MEDIA_COMMAND_TIME))
         {
-                if(! LLViewerMedia::hasMedia())
+                if(sMediaImpl.isNull())
                 {
                         LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                         play(parcel);
@@ -382,6 +437,119 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
                 }
         }
 }
+// Static
+/////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerParcelMedia::sendMediaNavigateMessage(const std::string& url)
+{
+        std::string region_url = gAgent.getRegion()->getCapability("ParcelNavigateMedia");
+        if (!region_url.empty())
+        {
+                // send navigate event to sim for link sharing
+                LLSD body;
+                body["agent-id"] = gAgent.getID();
+                body["local-id"] = LLViewerParcelMgr::getInstance()->getAgentParcel()->getLocalID();
+                body["url"] = url;
+                LLHTTPClient::post(region_url, body, new LLHTTPClient::Responder);
+        }
+        else
+        {
+                llwarns << "can't get ParcelNavigateMedia capability" << llendl;
+        }
+
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// inherited from LLViewerMediaObserver
+// virtual 
+void LLViewerParcelMedia::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
+{
+        switch(event)
+        {
+                case MEDIA_EVENT_CONTENT_UPDATED:
+                {
+                        // LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CONTENT_UPDATED " << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_TIME_DURATION_UPDATED:
+                {
+                        // LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_TIME_DURATION_UPDATED, time is " << self->getCurrentTime() << " of " << self->getDuration() << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_SIZE_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_SIZE_CHANGED " << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_CURSOR_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CURSOR_CHANGED, new cursor is " << self->getCursorName() << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_NAVIGATE_BEGIN:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_BEGIN " << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_NAVIGATE_COMPLETE:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_COMPLETE, result string is: " << self->getNavigateResultString() << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_PROGRESS_UPDATED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_PROGRESS_UPDATED, loading at " << self->getProgressPercent() << "%" << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_STATUS_TEXT_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_STATUS_TEXT_CHANGED, new status text is: " << self->getStatusText() << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_LOCATION_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_LOCATION_CHANGED, new uri is: " << self->getLocation() << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_CLICK_LINK_HREF:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CLICK_LINK_HREF, target is \"" << self->getClickTarget() << "\", uri is " << self->getClickURL() << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_CLICK_LINK_NOFOLLOW:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_CLICK_LINK_NOFOLLOW, uri is " << self->getClickURL() << LL_ENDL;
+                };
+                break;
+
+                case MEDIA_EVENT_PLUGIN_FAILED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_PLUGIN_FAILED" << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_PLUGIN_FAILED_LAUNCH:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_PLUGIN_FAILED_LAUNCH" << LL_ENDL;
+                };
+                break;
+                
+                case MEDIA_EVENT_NAME_CHANGED:
+                {
+                        LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_NAME_CHANGED" << LL_ENDL;
+                };
+                break;
+        };
+}
 
 bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel)
 {
@@ -399,3 +567,19 @@ bool callback_play_media(const LLSD& notification, const LLSD& response, LLParce
         return false;
 }
 
+// TODO: observer
+/*
+void LLViewerParcelMediaNavigationObserver::onNavigateComplete( const EventType& event_in )
+{
+        std::string url = event_in.getStringValue();
+
+        if (mCurrentURL != url && ! mFromMessage)
+        {
+                LLViewerParcelMedia::sendMediaNavigateMessage(url);
+        }
+
+        mCurrentURL = url;
+        mFromMessage = false;
+
+}
+*/
diff --git a/linden/indra/newview/llviewerparcelmedia.h b/linden/indra/newview/llviewerparcelmedia.h
index 1898870..0f1e85c 100644
--- a/linden/indra/newview/llviewerparcelmedia.h
+++ b/linden/indra/newview/llviewerparcelmedia.h
@@ -33,18 +33,22 @@
 #ifndef LLVIEWERPARCELMEDIA_H
 #define LLVIEWERPARCELMEDIA_H
 
-#include "llmediabase.h"
+#include "llviewermedia.h"
 
 class LLMessageSystem;
 class LLParcel;
+class LLViewerParcelMediaNavigationObserver;
+
 
 // This class understands land parcels, network traffic, LSL media
 // transport commands, and talks to the LLViewerMedia class to actually
 // do playback.  It allows us to remove code from LLViewerParcelMgr.
-class LLViewerParcelMedia
+class LLViewerParcelMedia : public LLViewerMediaObserver
 {
+        LOG_CLASS(LLViewerParcelMedia);
         public:
                 static void initClass();
+                static void cleanupClass();
 
                 static void update(LLParcel* parcel);
                         // called when the agent's parcel has a new URL, or the agent has
@@ -60,17 +64,38 @@ class LLViewerParcelMedia
                 static void start();
                         // restart after pause - no need for all the setup
 
+                static void focus(bool focus);
+
                 static void seek(F32 time);
                     // jump to timecode time
 
-                static LLMediaBase::EStatus getStatus();
+                static LLViewerMediaImpl::EMediaStatus getStatus();
+                static std::string getMimeType();
+                static viewer_media_t getParcelMedia();
 
                 static void processParcelMediaCommandMessage( LLMessageSystem *msg, void ** );
                 static void processParcelMediaUpdate( LLMessageSystem *msg, void ** );
+                static void sendMediaNavigateMessage(const std::string& url);
+                
+                // inherited from LLViewerMediaObserver
+                virtual void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
 
         public:
                 static S32 sMediaParcelLocalID;
                 static LLUUID sMediaRegionID;
+                // HACK: this will change with Media on a Prim
+                static viewer_media_t sMediaImpl;
+};
+
+
+class LLViewerParcelMediaNavigationObserver
+{
+public:
+        std::string mCurrentURL;
+        bool mFromMessage;
+
+        // void onNavigateComplete( const EventType& event_in );
+
 };
 
 #endif
diff --git a/linden/indra/newview/llviewerparcelmediaautoplay.cpp b/linden/indra/newview/llviewerparcelmediaautoplay.cpp
index dbb9c32..ccd6b14 100644
--- a/linden/indra/newview/llviewerparcelmediaautoplay.cpp
+++ b/linden/indra/newview/llviewerparcelmediaautoplay.cpp
@@ -109,7 +109,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
         if ((!mPlayed) &&                         // if we've never played
                 (mTimeInParcel > AUTOPLAY_TIME) &&    // and if we've been here for so many seconds
                 (this_media_url.size() != 0) &&       // and if the parcel has media
-                (!LLViewerMedia::isMediaPlaying()))   // and if the media is not already playing
+                (LLViewerParcelMedia::sMediaImpl.isNull()))   // and if the media is not already playing
         {
                 if (this_media_texture_id.notNull())  // and if the media texture is good
                 {
diff --git a/linden/indra/newview/llviewerparcelmediaautoplay.h b/linden/indra/newview/llviewerparcelmediaautoplay.h
index cc2e70b..16279e7 100644
--- a/linden/indra/newview/llviewerparcelmediaautoplay.h
+++ b/linden/indra/newview/llviewerparcelmediaautoplay.h
@@ -33,7 +33,6 @@
 #ifndef LLVIEWERPARCELMEDIAAUTOPLAY_H
 #define LLVIEWERPARCELMEDIAAUTOPLAY_H
 
-#include "llmediabase.h"
 #include "lltimer.h"
 
 // timer to automatically play media
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 61b91fe..3ed41a3 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -35,7 +35,7 @@
 #include "llviewerparcelmgr.h"
 
 // Library includes
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "indra_constants.h"
 #include "llcachename.h"
 #include "llgl.h"
@@ -1599,6 +1599,9 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                         // Request access list information for this land
                         LLViewerParcelMgr::getInstance()->sendParcelAccessListRequest(AL_ACCESS | AL_BAN);
 
+                        // Request the media url filter list for this land
+                        LLViewerParcelMgr::getInstance()->requestParcelMediaURLFilter();
+
                         // Request dwell for this land, if it's not public land.
                         LLViewerParcelMgr::getInstance()->mSelectedDwell = 0.f;
                         if (0 != local_id)
@@ -1726,21 +1729,6 @@ void optionally_start_music(const std::string& music_url)
         }
 }
 
-
-void callback_start_music(S32 option, void* data)
-{
-        if (option == 0)
-        {
-                // Before the callback, we verified the url was good.
-                // We fetch again to avoid lag while loading.
-                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();          
-                gAudiop->startInternetStream(parcel->getMusicURL());
-
-                LLOverlayBar::musicFirstRun();
-        }
-        gSavedSettings.setWarning("FirstStreamingMusic", FALSE);
-}
-
 // static
 void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void **user)
 {
@@ -1937,6 +1925,66 @@ void LLViewerParcelMgr::sendParcelAccessListUpdate(U32 which)
         }
 }
 
+class LLParcelMediaURLFilterResponder : public LLHTTPClient::Responder
+{
+        virtual void result(const LLSD& content)
+        {
+                LLViewerParcelMgr::getInstance()->receiveParcelMediaURLFilter(content);
+        }
+};
+
+void LLViewerParcelMgr::requestParcelMediaURLFilter()
+{
+        if (!mSelected)
+        {
+                return;
+        }
+
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
+        if (!region)
+        {
+                return;
+        }
+
+        LLParcel* parcel = mCurrentParcel;
+        if (!parcel)
+        {
+                llwarns << "no parcel" << llendl;
+                return;
+        }
+
+        LLSD body;
+        body["local-id"] = parcel->getLocalID();
+        body["list"] = parcel->getMediaURLFilterList();
+
+        std::string url = region->getCapability("ParcelMediaURLFilterList");
+        if (!url.empty())
+        {
+                LLHTTPClient::post(url, body, new LLParcelMediaURLFilterResponder);
+        }
+        else
+        {
+                llwarns << "can't get ParcelMediaURLFilterList cap" << llendl;
+        }
+}
+
+
+void LLViewerParcelMgr::receiveParcelMediaURLFilter(const LLSD &content)
+{
+        if (content.has("list"))
+        {
+                LLParcel* parcel = LLViewerParcelMgr::getInstance()->mCurrentParcel;
+                if (!parcel) return;
+                
+                if (content["local-id"].asInteger() == parcel->getLocalID())
+                {
+                        parcel->setMediaURLFilterList(content["list"]);
+                        
+                        LLViewerParcelMgr::getInstance()->notifyObservers();
+                }
+        }
+}
+
 
 void LLViewerParcelMgr::deedLandToGroup()
 {
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index 9f762a1..9bf6096 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -198,6 +198,11 @@ public:
         // Takes an Access List flag, like AL_ACCESS or AL_BAN
         void    sendParcelAccessListRequest(U32 flags);
 
+        // asks for the parcel's media url filter list
+        void    requestParcelMediaURLFilter();
+        // receive the response
+        void    receiveParcelMediaURLFilter(const LLSD &content);
+        
         // Dwell is not part of the usual parcel update information because the
         // simulator doesn't actually know the per-parcel dwell.  Ack!  We have
         // to get it out of the database.
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 4257f70..f06c3d8 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -322,7 +322,7 @@ void LLViewerRegion::loadCache()
 
         LLUUID cache_id;
         nread = fread(&cache_id.mData, 1, UUID_BYTES, fp);
-        if (nread != UUID_BYTES || mCacheID != cache_id)
+        if (nread != (size_t)UUID_BYTES || mCacheID != cache_id)
         {
                 llinfos << "Cache ID doesn't match for this region, discarding"
                         << llendl;
@@ -398,7 +398,7 @@ void LLViewerRegion::saveCache()
         }
 
         // write the cache id for this sim
-        if (fwrite(&mCacheID.mData, 1, UUID_BYTES, fp) != UUID_BYTES)
+        if (fwrite(&mCacheID.mData, 1, UUID_BYTES, fp) != (size_t)UUID_BYTES)
         {
                 llwarns << "Short write" << llendl;
         }
@@ -1428,6 +1428,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("MapLayerGod");
         capabilityNames.append("NewFileAgentInventory");
         capabilityNames.append("ParcelPropertiesUpdate");
+        capabilityNames.append("ParcelMediaURLFilterList");
+        capabilityNames.append("ParcelNavigateMedia");
         capabilityNames.append("ParcelVoiceInfoRequest");
         capabilityNames.append("ProductInfoRequest");
         capabilityNames.append("ProvisionVoiceAccountRequest");
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 981c9bc..34577a7 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -33,7 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llfocusmgr.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "llagent.h"
 #include "llinventory.h"
 #include "llinventorymodel.h"
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index eb8977c..f7713c2 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -54,7 +54,7 @@
 //
 
 // linden library includes
-#include "audioengine.h"                // mute on minimize
+#include "llaudioengine.h"              // mute on minimize
 #include "indra_constants.h"
 #include "llassetstorage.h"
 #include "llfontgl.h"
@@ -156,7 +156,6 @@
 #include "lltoolselectland.h"
 #include "lltoolview.h"
 #include "lluictrlfactory.h"
-#include "lluploaddialog.h"
 #include "llurldispatcher.h"            // SLURL from other app instance
 #include "llvieweraudio.h"
 #include "llviewercamera.h"
@@ -164,6 +163,8 @@
 #include "llviewerimagelist.h"
 #include "llviewerinventory.h"
 #include "llviewerkeyboard.h"
+#include "llviewermedia.h"
+#include "llviewermediafocus.h"
 #include "llviewermenu.h"
 #include "llviewermessage.h"
 #include "llviewerobjectlist.h"
@@ -310,7 +311,9 @@ public:
                                 S32 hours = (S32)(time / (60*60));
                                 S32 mins = (S32)((time - hours*(60*60)) / 60);
                                 S32 secs = (S32)((time - hours*(60*60) - mins*60));
-                                addText(xpos, ypos, llformat(" Debug %d: %d:%02d:%02d", idx, hours,mins,secs)); ypos += y_inc2;
+                                std::string label = gDebugTimerLabel[idx];
+                                if (label.empty()) label = llformat("Debug: %d", idx);
+                                addText(xpos, ypos, llformat(" %s: %d:%02d:%02d", label.c_str(), hours,mins,secs)); ypos += y_inc2;
                         }
                         
                         F32 time = gFrameTimeSeconds;
@@ -795,6 +798,7 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
         if (handle)
                 return handle;
 
+
         // *HACK: this should be rolled into the composite tool logic, not
         // hardcoded at the top level.
         if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode() && LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance())
@@ -1141,7 +1145,7 @@ void LLViewerWindow::handleDataCopy(LLWindow *window, S32 data_type, void *data)
         case SLURL_MESSAGE_TYPE:
                 // received URL
                 std::string url = (const char*)data;
-                LLWebBrowserCtrl* web = NULL;
+                LLMediaCtrl* web = NULL;
                 const bool trusted_browser = false;
                 if (LLURLDispatcher::dispatch(url, web, trusted_browser))
                 {
@@ -1736,6 +1740,19 @@ void LLViewerWindow::initWorldUI()
         // menu holder appears on top to get first pass at all mouse events
 
         mRootView->sendChildToFront(gMenuHolder);
+
+        if ( gHUDView == NULL )
+        {
+                LLRect hud_rect = full_window;
+                hud_rect.mBottom += 50;
+                if (gMenuBarView)
+                {
+                        hud_rect.mTop -= gMenuBarView->getRect().getHeight();
+                }
+                gHUDView = new LLHUDView(hud_rect);
+                // put behind everything else in the UI
+                mRootView->addChildAtEnd(gHUDView);
+        }
 }
 
 // Destroy the UI
@@ -2180,7 +2197,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
                 if (key < 0x80)
                 {
                         // Not a special key, so likely (we hope) to generate a character.  Let it fall through to character handler first.
-                        return gFocusMgr.childHasKeyboardFocus(mRootView);
+                        return (gFocusMgr.getKeyboardFocus() != NULL);
                 }
         }
 
@@ -2243,7 +2260,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
         }
 
         // Traverses up the hierarchy
-        LLUICtrl* keyboard_focus = gFocusMgr.getKeyboardFocus();
+        LLFocusableElement* keyboard_focus = gFocusMgr.getKeyboardFocus();
         if( keyboard_focus )
         {
                 // arrow keys move avatar while chatting hack
@@ -2377,7 +2394,7 @@ BOOL LLViewerWindow::handleUnicodeChar(llwchar uni_char, MASK mask)
         }
 
         // Traverses up the hierarchy
-        LLView* keyboard_focus = gFocusMgr.getKeyboardFocus();
+        LLFocusableElement* keyboard_focus = gFocusMgr.getKeyboardFocus();
         if( keyboard_focus )
         {
                 if (keyboard_focus->handleUnicodeChar(uni_char, FALSE))
@@ -2530,7 +2547,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
         }
 
         // clean up current focus
-        LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+        LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
         if (cur_focus)
         {
                 if (!cur_focus->isInVisibleChain() || !cur_focus->isInEnabledChain())
@@ -2910,12 +2927,18 @@ BOOL LLViewerWindow::handlePerFrameHover()
         {
                 do_pick = FALSE;
         }
+        
+        if(LLViewerMediaFocus::getInstance()->getFocus())
+        {
+                // When in-world media is in focus, pick every frame so that browser mouse-overs, dragging scrollbars, etc. work properly.
+                do_pick = TRUE;
+        }
 
         if (do_pick)
         {
                 mouse_moved_since_pick = FALSE;
                 mPickTimer.reset();
-                pickAsync(getCurrentMouseX(), getCurrentMouseY(), mask, hoverPickCallback, TRUE);
+                pickAsync(getCurrentMouseX(), getCurrentMouseY(), mask, hoverPickCallback, TRUE, TRUE);
         }
 
         previous_x = x;
@@ -4694,7 +4717,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
         BOOL result_first_try = FALSE;
         BOOL result_second_try = FALSE;
 
-        LLUICtrl* keyboard_focus = gFocusMgr.getKeyboardFocus();
+        LLFocusableElement* keyboard_focus = gFocusMgr.getKeyboardFocus();
         send_agent_pause();
         llinfos << "Stopping GL during changeDisplaySettings" << llendl;
         stopGL();
@@ -4923,7 +4946,6 @@ LLBottomPanel::LLBottomPanel(const LLRect &rect) :
 
         mFactoryMap["toolbar"] = LLCallbackMap(createToolBar, NULL);
         mFactoryMap["overlay"] = LLCallbackMap(createOverlayBar, NULL);
-        mFactoryMap["hud"] = LLCallbackMap(createHUD, NULL);
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_bars.xml", &getFactoryMap());
         
         setOrigin(rect.mLeft, rect.mBottom);
@@ -4946,12 +4968,6 @@ void LLBottomPanel::draw()
         LLPanel::draw();
 }
 
-void* LLBottomPanel::createHUD(void* data)
-{
-        gHUDView = new LLHUDView();
-        return gHUDView;
-}
-
 
 void* LLBottomPanel::createOverlayBar(void* data)
 {
@@ -5164,12 +5180,8 @@ void LLPickInfo::updateXYCoords()
                 LLPointer<LLViewerImage> imagep = gImageList.getImage(tep->getID());
                 if(mUVCoords.mV[VX] >= 0.f && mUVCoords.mV[VY] >= 0.f && imagep.notNull())
                 {
-                        LLCoordGL coords;
-                        
-                        coords.mX = llround(mUVCoords.mV[VX] * (F32)imagep->getWidth());
-                        coords.mY = llround(mUVCoords.mV[VY] * (F32)imagep->getHeight());
-
-                        gViewerWindow->getWindow()->convertCoords(coords, &mXYCoords);
+                        mXYCoords.mX = llround(mUVCoords.mV[VX] * (F32)imagep->getWidth());
+                        mXYCoords.mY = llround((1.f - mUVCoords.mV[VY]) * (F32)imagep->getHeight());
                 }
         }
 }
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index c8b26be..14b8d3e 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "audioengine.h"
+#include "llaudioengine.h"
 #include "noise.h"
 
 #include "llagent.h" //  Get state values from here
@@ -69,6 +69,7 @@
 #include "lltoolmorph.h"
 #include "llviewercamera.h"
 #include "llviewerimagelist.h"
+#include "llviewermedia.h"
 #include "llviewermenu.h"
 #include "llviewerobjectlist.h"
 #include "llviewerparcelmgr.h"
@@ -3825,6 +3826,18 @@ void LLVOAvatar::idleUpdateTractorBeam()
         {
                 return;
         }
+        const LLPickInfo& pick = gViewerWindow->getLastPick();
+
+        // No beam for media textures
+        // TODO: this will change for Media on a Prim
+        if(pick.getObject() && pick.mObjectFace >= 0)
+        {
+                const LLTextureEntry* tep = pick.getObject()->getTE(pick.mObjectFace);
+                if (tep && LLViewerMedia::textureHasMedia(tep->getID()))
+                {
+                        return;
+                }
+        }
 
         // This is only done for yourself (maybe it should be in the agent?)
         if (!needsRenderBeam() || !mIsBuilt)
@@ -3935,7 +3948,7 @@ void LLVOAvatar::idleUpdateTractorBeam()
                         }
                         else
                         {
-                                const LLPickInfo& pick = gViewerWindow->getLastPick();
+                                
                                 mBeam->setPositionGlobal(pick.mPosGlobal);
                         }
 
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 5f7327d..385dbe0 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -1694,7 +1694,7 @@ void LLVOVolume::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_p
                         trans_mat.translate(getRegion()->getOriginAgent());
                 }
 
-                volume->generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals, nodep->mSilhouetteSegments, view_vector, trans_mat, mRelativeXformInvTrans);
+                volume->generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals, nodep->mSilhouetteSegments, view_vector, trans_mat, mRelativeXformInvTrans, nodep->getTESelectMask());
 
                 nodep->mSilhouetteExists = TRUE;
         }
diff --git a/linden/indra/newview/llweb.cpp b/linden/indra/newview/llweb.cpp
index fb4b063..7021b48 100644
--- a/linden/indra/newview/llweb.cpp
+++ b/linden/indra/newview/llweb.cpp
@@ -38,7 +38,7 @@
 #include "llviewerwindow.h"
 
 #include "llviewercontrol.h"
-#include "llfloaterhtmlhelp.h"
+#include "llfloatermediabrowser.h"
 
 // static
 void LLWeb::initClass()
diff --git a/linden/indra/newview/mozilla-powerpc-darwin-readme.txt b/linden/indra/newview/mozilla-powerpc-darwin-readme.txt
index be67ad3..e69de29 100644
--- a/linden/indra/newview/mozilla-powerpc-darwin-readme.txt
+++ b/linden/indra/newview/mozilla-powerpc-darwin-readme.txt
@@ -1,71 +0,0 @@
-NOTE: these directions have been obsoleted.  There are now shell scripts that will check out, build, and package the necessary pieces
-of the mozilla code in lindelib/mozilla-1.8.0/mac-build.  I'm leaving this file here for historical interest.
--------------
-Written by Monroe on June 17, 2005.
-
-Here's how to rebuild the Mozilla components for the Mac build.
-
-Check out the mozilla source from cvs
-
-cd to the mozilla directory (the same one that contains client.mk)
-
-cp .mozconfig.opt.shared.small .mozconfig
-
-Add the following line to the .mozconfig file you just created:
-
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.2.8.sdk
-
-make -f client.mk build
-
-wait a while.
-
-The build products you need to extract are in objdir-opt-shared-small/dist/bin and objdir-opt-shared-small/dist/lib.
- 
-Copy the following to linden/libraries/firefox-1.0.4/<arch>/lib_release and linden/libraries/firefox-1.0.4/<arch>/lib_release:
-
-objdir-opt-shared-small/dist/lib/libembed_base_s.a
-objdir-opt-shared-small/dist/lib/libxpcomglue_s.a
-objdir-opt-shared-small/dist/bin/libxpcom.dylib
-objdir-opt-shared-small/dist/bin/libplds4.dylib
-objdir-opt-shared-small/dist/bin/libplc4.dylib
-objdir-opt-shared-small/dist/bin/libnspr4.dylib
-objdir-opt-shared-small/dist/bin/libgkgfx.dylib
-
-This first part should be repeated with .mozconfig.debug.shared.small to generate the libraries in the two matching lib_debug directories.  The debug version of the bin directory is prohibitively large, so we're just using the release version of that part.
-
-Much of the contents of objdir-opt-shared-small/dist/bin also needs to go into a tar file that will be used when generating the application bundle.  
-
-The bin directory will be populated with symlinks.  If you just tar it up as-is, you'll get a tar file full of symlinks, which is not useful.
-
-Use 'cp -RL source dest' to make a copy of the bin directory with all symlinks expanded.  This will be more useful.
-
-Remove things that aren't needed.  This includes at least:
-
-asdecode
-firefox
-firefox-bin
-firefox-config
-LICENSE
-nsinstall
-mangle
-regxpcom
-regchrome
-README.txt
-run-mozilla.sh
-xpcshell
-xpt_dump
-shlibsign
-xpt_link
-xpidl
-xpicleanup
-
-There may be other pieces that aren't needed as well.  I expect this will be refined moving forward.
-
-Because of the way the tar file will be expanded (directly inside the application bundle, in Contents/MacOS), it's important to create it so that it won't expand at a subdirectory of the current path.  The way to to this is to cd to the dist/bin directory and do something like this:
-
-tar -zcvf ../mozilla-powerpc-darwin.tgz .
-
-This will create a tar file containing everything in the current directory, and will place the file one level up (so it doesn't interfere with its own creation).  This file should replace the file with the above name checked into cvs in linden/indra/newview/.  One of the lines in the shell script phase of the build extracts it appropriately into the application bundle.
-
-If any of this is unclear, please contact Monroe and I'll try to clarify and update this file.
-
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index f10aca5..72da3c6 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -35,7 +35,7 @@
 #include "pipeline.h"
 
 // library includes
-#include "audioengine.h" // For MAX_BUFFERS for debugging.
+#include "llaudioengine.h" // For MAX_BUFFERS for debugging.
 #include "imageids.h"
 #include "llerror.h"
 #include "llviewercontrol.h"
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 0b4a088..f2189a4 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -16,7 +16,9 @@
   <texture name="toolbar_btn_selected.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> 
   
   <texture name="button_enabled_selected_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
-  
+
+  <texture name="media_panel_bg.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" />
+  <texture name="media_panel_hoverrectangle.png" preload="true" scale_left="9" scale_top="9" scale_right="9" scale_bottom="9" />
   <texture name="checkbox_disabled_false.tga"   preload="true"/>
   <texture name="checkbox_disabled_true.tga"    preload="true"/>
   <texture name="checkbox_enabled_false.tga"    preload="true"/>
@@ -376,7 +378,23 @@
   <texture name="default_profile_picture.j2c"/>
   <texture name="locked_image.j2c"/>
 
+
    <!-- Kitty Viewer Art -->
    <texture name="Inv_WindLight" file_name="Inv_WindLight.png" preload="false" />
    <texture name="Inv_WaterLight" file_name="Inv_WaterLight.png" preload="false" />
+
+  <texture name="media_btn_back.png"/>
+  <texture name="media_btn_done.png"/>
+  <texture name="media_btn_forward.png"/>
+  <texture name="media_btn_home.png"/>
+  <texture name="media_btn_newwindow.png"/>
+  <texture name="media_btn_optimalzoom.png"/>
+  <texture name="media_btn_reload.png"/>
+  <texture name="media_btn_scrolldown.png"/>
+  <texture name="media_btn_scrollleft.png"/>
+  <texture name="media_btn_scrollright.png"/>
+  <texture name="media_btn_scrollup.png"/>
+  <texture name="media_btn_stoploading.png"/>
+  <texture name="media_panel_divider.png"/>
+
 </textures>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 9bc91e7..c8aacba 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -800,143 +800,633 @@ Only large parcels can be listed in search.
                                 No Pushing (Region Override)
                         </string>
                 </panel>
-                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="363" label="Media" left="1" mouse_opaque="true"
-                     name="land_media_panel" width="458">
-                        <text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="with media:" width="65">
-                                Media Type:
-                        </text>
-                        <combo_box allow_text_entry="false" bottom_delta="0" follows="left|top" height="18"
-                             left="80" max_chars="20" name="media type"
-                             tool_tip="Specify if the URL is a movie, web page, or other media"
-                             width="120" />
-                        <text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             left_delta="130" name="mime_type" width="200" />
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="at URL:" width="65">
-                                Media URL:
-                        </text>
-                        <line_editor bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="80"
-                             max_length="255" name="media_url" right="-80"
-                             select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
-                             name="set_media_url" right="-12" scale_image="true" width="60" />
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="Description:" width="364">
+                <panel
+                         border="true"
+                         border_visible="true"
+                         bottom="-363"
+                         enabled="true"
+                         follows="left|top|right|bottom"
+                         height="513"
+                         label="Media"
+                         left="1"
+                         mouse_opaque="true"
+                         name="land_media_panel"
+                         width="458">
+                        <text
+                                 bottom="-25"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 mouse_opaque="true"
+                                 name="with media:"
+                                 type="string"
+                                 width="65">
+                                Type:
+                        </text>
+                        <combo_box
+                                 allow_text_entry="false"
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 height="18"
+                                 left="80"
+                                 max_chars="20"
+                                 name="media type"
+                                 tool_tip="Specify if the URL is a movie, web page, or other media"
+                                 width="120" />
+                        <text
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 left_delta="130"
+                                 name="mime_type"
+                                 width="200" />
+                        <text type="string"
+                                 bottom_delta="-21"
+                                 follows="left|top"
+                                 font="SansSerifSmall" halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="at URL:"
+                                 width="65">
+                                Home URL:
+                        </text>
+                        <line_editor
+                                 bottom_delta="0"
+                                 follows="left|top|right"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 left="80"
+                                 max_length="255"
+                                 name="media_url"
+                                 right="-90"
+                                 select_all_on_focus_received="true"
+                                 select_on_focus="true"
+                                 text_readonly_color="0.576471 0.662745 0.835294 1" />
+                        <button
+                                 bottom_delta="0"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="center"
+                                 height="16"
+                                 label="Set..."
+                                 label_selected="Set..."
+                                 mouse_opaque="true"
+                                 name="set_media_url"
+                                 right="-12"
+                                 scale_image="true"
+                                 width="70" />
+                        <text
+                                 bottom_delta="-22"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="at URL:"
+                                 type="string"
+                                 width="65">
+                                Current URL:
+                        </text>
+                        <text
+                                 bottom_delta="0"
+                                 follows="left|top|right"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="80"
+                                 name="current_url"
+                                 right="-90" />
+                        <button
+                                 bottom_delta="0"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="center"
+                                 height="16"
+                                 label="Reset..."
+                                 label_selected="Reset..."
+                                 mouse_opaque="true"
+                                 name="reset_media_url"
+                                 right="-12"
+                                 scale_image="true"
+                                 width="70" />
+                        <check_box
+                                 bottom_delta="-22"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 initial_value="false"
+                                 label="Hide URL"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="hide_media_url"
+                                 radio_style="false"
+                                 tool_tip="Checking this option will hide the media URL from any non-authorized viewers of this parcel information. Note this is not available for HTML types."
+                                 width="150" />
+                        <text
+                                 bottom_delta="0"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="right"
+                                 height="16"
+                                 length="1"
+                                 name="media_reset"
+                                 right="-164"
+                                 tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)"
+                                 type="string"
+                                 width="185">
+                                Return to Home URL in:
+                        </text>
+                        <spinner
+                                 bottom_delta="0"
+                                 decimal_digits="0"
+                                 enabled="false"
+                                 follows="right|top"
+                                 halign="right"
+                                 height="16"
+                                 increment="1"
+                                 initial_val="0"
+                                 max_val="1024"
+                                 min_val="0"
+                                 name="media_reset_time"
+                                 right="-90"
+                                 tool_tip="Amount of time until parcel reverts to default URL (0 for never return)"
+                                 width="64" />
+                        <text
+                                 bottom_delta="0"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left_delta="70"
+                                 length="1"
+                                 name="minutes"
+                                 right="-10"
+                                 type="string">
+                                Minutes
+                        </text>
+                        <text
+                                 bottom_delta="-22"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="Description:"
+                                 type="string"
+                                 width="364">
                                 Description:
                         </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             follows="left|top" font="SansSerifSmall" height="16" left="80"
-                             max_length="255" name="url_description" right="-80"
-                             select_all_on_focus_received="true" select_on_focus="true"
-                             tool_tip="Text displayed next to play/load button" spell_check="true" />
-                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="Media texture:" width="364">
-                                Replace
-Texture:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom_delta="-64" can_apply_immediately="false"
-                             default_image_name="Default" follows="left|top" height="80" label=""
-                             left="80" name="media texture" tool_tip="Click to choose a picture"
-                             width="64" />
-                        <text type="string" length="1" bottom_delta="48" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left_delta="75" name="replace_texture_help" width="270">
-                                (Objects using this texture will show the movie or
-web page after you click the play arrow.)
-                        </text>
-                        <text type="string" length="1" bottom_delta="-55" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" mouse_opaque="true" name="Options:" width="292">
-                                Media
-Options:
-                        </text>
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Auto scale" left="80"
-                             mouse_opaque="true" name="media_auto_scale" radio_style="false"
-                             tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
-                             width="200" />
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Loop Media" left="250"
-                             mouse_opaque="true" name="media_loop" radio_style="false"
-                             tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
-                             width="200" />
-                        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Hide Media URL" left="80"
-                             mouse_opaque="true" name="hide_media_url" radio_style="false"
-                             tool_tip="Checking this option will hide the media url to any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-                             width="200" />
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Hide Music URL" left="250"
-                             mouse_opaque="true" name="hide_music_url" radio_style="false"
-                             tool_tip="Checking this option will hide the music url to any non-authorized viewers of this parcel information"
-                             width="200" />
-                        <text type="string" length="1" bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="85" name="media_size"
-                             tool_tip="Size to render Web media, leave 0 for default." width="85">
-                                Media size:
-                        </text>
-                        <spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top"
-                             halign="right" height="16" increment="1" initial_val="0" left_delta="65"
-                             max_val="1024" min_val="0" name="media_size_width"
-                             tool_tip="Size to render Web media, leave 0 for default." width="64" />
-                        <spinner bottom_delta="0" decimal_digits="0" enabled="false" follows="left|top"
-                             halign="right" height="16" increment="1" initial_val="0" left_delta="80"
-                             max_val="1024" min_val="0" name="media_size_height"
-                             tool_tip="Size to render Web media, leave 0 for default." width="64" />
-                        <text type="string" length="1" bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left_delta="70" name="pixels" right="-10">
+                        <line_editor
+                                 bevel_style="in"
+                                 border_style="line"
+                                 border_thickness="1"
+                                 bottom_delta="0"
+                                 follows="left|top|right"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 left="80"
+                                 max_length="255"
+                                 name="url_description"
+                                 right="-90"
+                                 select_all_on_focus_received="true"
+                                 select_on_focus="true"
+                                 tool_tip="Text displayed next to play/load button" />
+                        <text
+                                 bottom_delta="-28"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="Media texture:"
+                                 type="string"
+                                 width="364">
+                                Texture:
+                        </text>
+                        <texture_picker
+                                 allow_no_texture="true"
+                                 bottom_delta="-64"
+                                 can_apply_immediately="false"
+                                 default_image_name="Default"
+                                 follows="left|top"
+                                 height="80"
+                                 label=""
+                                 left="80"
+                                 name="media texture"
+                                 tool_tip="Click to choose a texture"
+                                 width="64" />
+                        <text
+                                 type="string"
+                                 length="1"
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="80"
+                                 left_delta="75"
+                                 name="replace_texture_help"
+                                 width="270">
+                                Objects using this texture will show the movie or
+web page after you click the play arrow.
+
+Select the thumbnail to choose a different texture.
+                        </text>
+                        <text
+                                 bottom_delta="-16"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 mouse_opaque="true"
+                                 name="Options:"
+                                 top_delta="0"
+                                 type="string"
+                                 width="64">
+                                Options:
+                        </text>
+                        <check_box
+                                 bottom_delta="0"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 initial_value="false"
+                                 label="Loop"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="media_loop"
+                                 radio_style="false"
+                                 tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
+                                 width="200" />
+                        <check_box
+                                 bottom_delta="0"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 initial_value="false"
+                                 label="Auto scale"
+                                 left_delta="80"
+                                 mouse_opaque="true"
+                                 name="media_auto_scale"
+                                 radio_style="false"
+                                 tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
+                                 width="200" />
+                        <text
+                                 bottom_delta="-24"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 name="media_size"
+                                 tool_tip="Size to render Web media, leave 0 for default."
+                                 type="string"
+                                 width="85">
+                                Media Size:
+                        </text>
+                        <spinner
+                                 bottom_delta="0"
+                                 decimal_digits="0"
+                                 enabled="false"
+                                 follows="left|top"
+                                 halign="right"
+                                 height="16"
+                                 increment="1"
+                                 initial_val="0"
+                                 left="80"
+                                 max_val="1024"
+                                 min_val="0"
+                                 name="media_size_width"
+                                tool_tip="Width to render Web media, leave 0 for default."
+                                 width="60" />
+                        <spinner
+                                 bottom_delta="0"
+                                 decimal_digits="0"
+                                 enabled="false"
+                                 follows="left|top"
+                                 halign="right"
+                                 height="16"
+                                 increment="1"
+                                 initial_val="0"
+                                 left_delta="64"
+                                 max_val="1024"
+                                 min_val="0"
+                                 name="media_size_height"
+                                 tool_tip="Height to render Web media, leave 0 for default."
+                                 width="60" />
+                        <text
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 halign="left"
+                                 height="16"
+                                 left_delta="64"
+                                 length="1"
+                                 name="pixels"
+                                 type="string"
+                                 width="70">
                                 pixels
                         </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-40" drop_shadow_visible="true" enabled="true"
-                             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="16" left="10" mouse_opaque="true" name="MusicURL:" v_pad="0"
-                             width="364">
+                        <text
+                                 bg_visible="false"
+                                 border_drop_shadow_visible="false"
+                                 border_visible="false"
+                                 bottom_delta="-30"
+                                 drop_shadow_visible="true"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 h_pad="0"
+                                 halign="left"
+                                 height="16"
+                                 left="10"
+                                 length="1"
+                                 mouse_opaque="true"
+                                 name="Interaction:"
+                                 type="string"
+                                 v_pad="0"
+                                 width="364">
+                                Interaction:
+                        </text>
+                        <radio_group
+                                 bottom_delta="-2"
+                                 draw_border="false"
+                                 enabled="true"
+                                 follows="left|top"
+                                 height="22"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="radio_navigate_allow"
+                                 tab_stop="true"
+                                 width="219">
+                                <radio_item
+                                         bottom="-20"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="0"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Anyone"
+                                         tool_tip="Any resident can interact with media."
+                                         type="string"
+                                         width="70">
+                                        Anyone
+                                </radio_item>
+                                <radio_item
+                                         bottom="-20"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="80"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Group"
+                                         tool_tip="Group permissions control who can interact with media."
+                                         type="string"
+                                         width="70">
+                                        Group
+                                </radio_item>
+                        </radio_group>
+                        <check_box
+                                 bottom_delta="-22"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 initial_value="false"
+                                 label="Allow browsing only within these domains:"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="check navigate filter"
+                                 radio_style="false"
+                                 width="292" />
+                        <line_editor
+                                 bevel_style="in"
+                                 border_style="line"
+                                 border_thickness="1"
+                                 bottom_delta="-20"
+                                 enabled="true"
+                                 follows="left|top|right"
+                                 font="SansSerifSmall"
+                                 handle_edit_keys_directly="false"
+                                 height="16"
+                                 left="80"
+                                 max_length="63"
+                                 mouse_opaque="true"
+                                 name="navigate_filter_domain"
+                                 right="-90"
+                                 select_all_on_focus_received="false"
+                                 select_on_focus="false" />
+                        <button
+                                 bottom_delta="0"
+                                 enabled="true"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="center"
+                                 height="16"
+                                 label="Add..."
+                                 label_selected="Add..."
+                                 right="-12"
+                                 mouse_opaque="true"
+                                 name="add_navigate_filter"
+                                 scale_image="true"
+                                 width="70" />
+                        <scroll_list
+                                 bottom_delta="-52"
+                                 can_resize="false"
+                                 column_padding="0"
+                                 draw_heading="false"
+                                 draw_stripes="false"
+                                 follows="left|top|right"
+                                 height="50"
+                                 halign="left"
+                                 left="80"
+                                 multi_select="false"
+                                 name="filter_list"
+                                 right="-90"
+                                 search_column="0"
+                                 sort_column="0">
+                                <column
+                                         halign="left"
+                                         label="Domain"
+                                         name="domain"
+                                         sort="domain"/>
+                        </scroll_list>
+                        <button
+                                 bottom_delta="0"
+                                 enabled="true"
+                                 follows="right|top"
+                                 font="SansSerifSmall"
+                                 halign="center"
+                                 height="16"
+                                 label="Remove"
+                                 label_selected="Remove"
+                                 right="-12"
+                                 mouse_opaque="true"
+                                 name="remove_navigate_filter"
+                                 scale_image="true"
+                                 width="70" />
+                </panel>
+                <panel
+                         border="true"
+                         follows="left|top|right|bottom"
+                         height="363"
+                         label="Audio"
+                         layout="topleft"
+                         left_delta="0"
+                         name="land_audio_panel"
+                         top_delta="1"
+                         width="458">
+                        <text
+                                 bottom="-45"
+                                 follows="left|top"
+                                 height="16"
+                                 layout="topleft"
+                                 left="10"
+                                 length="1"
+                                 name="MusicURL:"
+                                 type="string"
+                                 width="364">
                                 Music URL:
                         </text>
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             enabled="true" follows="left|top" font="SansSerifSmall"
-                             handle_edit_keys_directly="false" height="16" left="80" max_length="255"
-                             mouse_opaque="true" name="music_url" right="-15"
-                             select_all_on_focus_received="true" select_on_focus="true"/>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-40" drop_shadow_visible="true" enabled="true"
-                             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="16" left="10" mouse_opaque="true" name="Sound:" v_pad="0"
-                             width="364">
+                        <line_editor
+                                 border_style="line"
+                                 border_thickness="1"
+                                 bottom_delta="0"
+                                 follows="left|top|right"
+                                 height="16"
+                                 layout="topleft"
+                                 left="80"
+                                 max_length="255"
+                                 name="music_url"
+                                 right="-15"
+                                 select_on_focus="true" />
+                        <check_box
+                                 bottom_delta="-25"
+                                 enabled="true"
+                                 follows="left|top"
+                                 font="SansSerifSmall"
+                                 height="16"
+                                 initial_value="false"
+                                 label="Hide URL"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="hide_music_url"
+                                 radio_style="false"
+                                 tool_tip="Checking this option will hide the music URL from any non-authorized viewers of this parcel information."
+                                 width="150" />
+                        <text
+                                 bottom_delta="-65"
+                                 follows="left|top"
+                                 height="16"
+                                 layout="topleft"
+                                 left="10"
+                                 length="1"
+                                 name="Sound:"
+                                 type="string"
+                                 width="364">
                                 Sound:
                         </text>
-                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false"
-                             label="Restrict gesture and object sounds to this parcel" left="80"
-                             mouse_opaque="true" name="check sound local" radio_style="false"
-                             width="292" />
-                        <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
-                             halign="center" height="18" label="?" label_selected="?" left="372"
-                             mouse_opaque="true" name="?" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-40" enabled="true" follows="left|top" font="SansSerifSmall"
-                             h_pad="0" halign="left" height="16" left="10" mouse_opaque="false"
-                             name="Voice settings:" tab_stop="false" v_pad="0" width="364">
+                        <check_box
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 height="16"
+                                 label="Restrict gesture and object sounds to this parcel"
+                                 layout="topleft"
+                                 left_delta="70"
+                                 name="check_sound_local"
+                                 width="200" />
+                        <button
+                                 bottom_delta="0"
+                                 follows="left|top"
+                                 height="18"
+                                 label="?"
+                                 label_selected="?"
+                                 layout="topleft"
+                                 left_delta="292"
+                                 name="?"
+                                 width="18" />
+                        <text
+                                 bottom_delta="-65"
+                                 follows="left|top"
+                                 height="16"
+                                 layout="topleft"
+                                 left="10"
+                                 length="1"
+                                 mouse_opaque="false"
+                                 name="Voice:"
+                                 type="string"
+                                 width="364">
                                 Voice:
                         </text>
-                        <check_box bottom_delta="-0" enabled="true" follows="left|top"
-                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel"
-                             tab_stop="true" width="463"
-                             label="Enable Voice"
-                        />
-                        <check_box bottom_delta="-0" enabled="false" follows="left|top"
-                             height="54" left="80" mouse_opaque="true" name="parcel_enable_voice_channel_is_estate_disabled"
-                             tab_stop="true" width="463"
-                             label="Enable Voice (established by the Estate)"
-                        />
-                        <check_box bottom_delta="-20" enabled="true" follows="left|top"
-                             height="54" left="100" mouse_opaque="true" name="parcel_enable_voice_channel_parcel"
-                             tab_stop="true" width="443"
-                             label="Restrict Voice to this parcel"
-                        />
+                        <radio_group
+                                 bottom_delta="-40"
+                                 draw_border="false"
+                                 enabled="true"
+                                 follows="left|top"
+                                 height="60"
+                                 left="80"
+                                 mouse_opaque="true"
+                                 name="parcel_voice_channel"
+                                 tab_stop="true"
+                                 width="219">
+                                <radio_item
+                                         bottom="-19"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="0"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Estate"
+                                         tool_tip="Use the estate voice channel."
+                                         type="string"
+                                         width="70">
+                                        Estate Channel
+                                </radio_item>
+                                <radio_item
+                                         bottom="-39"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="0"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Parcel"
+                                         tool_tip="Restrict Voice to this parcel."
+                                         type="string"
+                                         width="70">
+                                        Parcel Channel
+                                </radio_item>
+                                <radio_item
+                                         bottom="-59"
+                                         enabled="true"
+                                         follows="left|top"
+                                         height="16"
+                                         left="0"
+                                         length="1"
+                                         mouse_opaque="true"
+                                         name="Disabled"
+                                         tool_tip="Disable voice on this parcel."
+                                         type="string"
+                                         width="70">
+                                        Disabled
+                                </radio_item>
+                        </radio_group>
                 </panel>
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                      height="333" label="Access" left="1" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index b30ca89..c1bfdcc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -18,7 +18,20 @@
                         <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
                              left_delta="58" name="home" width="55" />
                 </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" height="20" left="0"
+    <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false"
+                     width="800">
+      <button bottom="0" follows="left|top" height="20" label="rewind" left="0" name="rewind"
+                             width="55" />
+      <button bottom_delta="0" follows="left|top" height="20" label="" left_delta="55"
+                             name="play" width="55" image_unselected="button_anim_play.tga"     image_selected="button_anim_play_selected.tga" scale_image="true" />
+      <button bottom_delta="0" follows="left|top" height="20" label="" left_delta="0"
+                             name="pause" width="55" image_unselected="button_anim_pause.tga"   image_selected="button_anim_pause_selected.tga" scale_image="true" />
+      <button bottom_delta="0" follows="left|top" height="20" label="stop"
+                             left_delta="65" name="stop" width="55" />
+      <button bottom_delta="0" follows="left|top" height="20" label="forward"
+                             left_delta="75" name="seek" width="55" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" height="20" left="0"
                      name="parcel_owner_controls" user_resize="false" width="540">
                         <button bottom="0" enabled="false" follows="left|top" height="20"
                              label="Send Current URL to Parcel" left="0" name="assign" width="200" />
@@ -38,4 +51,10 @@
                              name="close" width="70" />
                 </layout_panel>
         </layout_stack>
+  <string name="home_page_url">
+    http://www.secondlife.com
+  </string>
+  <string name="support_page_url">
+    http://support.secondlife.com
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
index e3d1021..e69de29 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
@@ -1,456 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<mimetypes name="default">
-        <defaultlabel>
-                (Unknown)
-        </defaultlabel>
-        <defaultwidget>
-                none
-        </defaultwidget>
-        <defaultimpl>
-                LLMediaImplLLMozLib
-        </defaultimpl>
-        <widgetset name="web">
-                <label name="web_label">
-                        Web Content
-                </label>
-                <icon>
-                        icn_media_web.tga
-                </icon>
-                <default_type>
-                        text/html
-                </default_type>
-                <tooltip name="web_tooltip">
-                        This location has Web content
-                </tooltip>
-                <playtip name="web_playtip">
-                        Show Web content
-                </playtip>
-                <allow_resize>
-                        true
-                </allow_resize>
-                <allow_looping>
-                        false
-                </allow_looping>
-        </widgetset>
-        <widgetset name="movie">
-                <label name="movie_label">
-                        Movie
-                </label>
-                <default_type>
-                        video/*
-                </default_type>
-                <icon>
-                        icn_media_movie.tga
-                </icon>
-                <tooltip name="movie_tooltip">
-                        There is a movie to play here
-                </tooltip>
-                <playtip name="movie_playtip">
-                        Play movie
-                </playtip>
-                <allow_resize>
-                        false
-                </allow_resize>
-                <allow_looping>
-                        true
-                </allow_looping>
-        </widgetset>
-        <widgetset name="none">
-                <label name="none_label">
-                        No Content
-                </label>
-                <default_type>
-                        none/none
-                </default_type>
-                <icon>
-                        icn_media_web.tga
-                </icon>
-                <tooltip name="none_tooltip">
-                        No media here
-                </tooltip>
-                <playtip name="none_playtip" />
-                <allow_resize>
-                        false
-                </allow_resize>
-                <allow_looping>
-                        false
-                </allow_looping>
-        </widgetset>
-        <widgetset name="image">
-                <label name="image_label">
-                        Image
-                </label>
-                <icon>
-                        icn_media_web.tga
-                </icon>
-                <default_type>
-                        image/*
-                </default_type>
-                <tooltip name="image_tooltip">
-                        There is an image at this location
-                </tooltip>
-                <playtip name="image_playtip">
-                        View this location&apos;s image
-                </playtip>
-                <allow_resize>
-                        false
-                </allow_resize>
-                <allow_looping>
-                        false
-                </allow_looping>
-        </widgetset>
-        <widgetset name="audio">
-                <label name="audio_label">
-                        Audio
-                </label>
-                <icon>
-                        icn_media_web.tga
-                </icon>
-                <default_type>
-                        audio/*
-                </default_type>
-                <tooltip name="audio_tooltip">
-                        There is audio at this location
-                </tooltip>
-                <playtip name="audio_playtip">
-                        Play this location&apos;s audio
-                </playtip>
-                <allow_resize>
-                        false
-                </allow_resize>
-                <allow_looping>
-                        true
-                </allow_looping>
-        </widgetset>
-        <scheme name="rtsp">
-                <label name="rtsp_label">
-                        Real Time Streaming
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-        </scheme>
-        <mimetype name="blank">
-                <label name="blank_label">
-                        - None -
-                </label>
-                <widgettype>
-                        none
-                </widgettype>
-                <impl>
-                        LLMediaImplQuickTime
-                </impl>
-        </mimetype>
-        <mimetype name="none/none">
-                <label name="none/none_label">
-                        - None -
-                </label>
-                <widgettype>
-                        none
-                </widgettype>
-        </mimetype>
-        <mimetype name="audio/*">
-                <label name="audio2_label">
-                        Audio
-                </label>
-                <widgettype>
-                        audio
-                </widgettype>
-        </mimetype>
-        <mimetype name="video/*">
-                <label name="video2_label">
-                        Video
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-        </mimetype>
-        <mimetype name="image/*">
-                <label name="image2_label">
-                        Image
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-        </mimetype>
-        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
-                <label name="vnd.secondlife.qt.legacy_label">
-                        Movie (QuickTime)
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-                <impl>
-                        LLMediaImplQuickTime
-                </impl>
-        </mimetype>
-        <mimetype name="application/javascript">
-                <label name="application/javascript_label">
-                        Javascript
-                </label>
-                <widgettype>
-                        web
-                </widgettype>
-        </mimetype>
-        <mimetype name="application/ogg">
-                <label name="application/ogg_label">
-                        Ogg Audio/Video
-                </label>
-                <widgettype>
-                        audio
-                </widgettype>
-        </mimetype>
-        <mimetype name="application/pdf">
-                <label name="application/pdf_label">
-                        PDF Document
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-        </mimetype>
-        <mimetype name="application/postscript">
-                <label name="application/postscript_label">
-                        Postscript Document
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-        </mimetype>
-        <mimetype name="application/rtf">
-                <label name="application/rtf_label">
-                        Rich Text (RTF)
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-        </mimetype>
-        <mimetype name="application/smil">
-                <label name="application/smil_label">
-                    Synchronized Multimedia Integration Language (SMIL)
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-        </mimetype>
-        <mimetype name="application/xhtml+xml">
-                <label name="application/xhtml+xml_label">
-                        Web Page (XHTML)
-                </label>
-                <widgettype>
-                        web
-                </widgettype>
-        </mimetype>
-        <mimetype name="application/x-director">
-                <label name="application/x-director_label">
-                        Macromedia Director
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-        </mimetype>
-        <mimetype name="application/x-shockwave-flash">
-                <label name="application/x-shockwave-flash_label">
-                        Flash
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-        </mimetype>
-        <mimetype name="audio/mid">
-                <label name="audio/mid_label">
-                        Audio (MIDI)
-                </label>
-                <widgettype>
-                        audio
-                </widgettype>
-        </mimetype>
-        <mimetype name="audio/mpeg">
-                <label name="audio/mpeg_label">
-                        Audio (MP3)
-                </label>
-                <widgettype>
-                        audio
-                </widgettype>
-        </mimetype>
-        <mimetype name="audio/x-aiff">
-                <label name="audio/x-aiff_label">
-                        Audio (AIFF)
-                </label>
-                <widgettype>
-                        audio
-                </widgettype>
-        </mimetype>
-        <mimetype name="audio/x-wav">
-                <label name="audio/x-wav_label">
-                        Audio (WAV)
-                </label>
-                <widgettype>
-                        audio
-                </widgettype>
-        </mimetype>
-        <mimetype menu="1" name="image/bmp">
-                <label name="image/bmp_label">
-                        Image (BMP)
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="image/gif">
-                <label name="image/gif_label">
-                        Image (GIF)
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="image/jpeg">
-                <label name="image/jpeg_label">
-                        Image (JPEG)
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="image/png">
-                <label name="image/png_label">
-                        Image (PNG)
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype name="image/svg+xml">
-                <label name="image/svg+xml_label">
-                        Image (SVG)
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="image/tiff">
-                <label name="image/tiff_label">
-                        Image (TIFF)
-                </label>
-                <widgettype>
-                        image
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="text/html">
-                <label name="text/html_label">
-                        Web Page
-                </label>
-                <widgettype>
-                        web
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="text/plain">
-                <label name="text/plain_label">
-                        Text
-                </label>
-                <widgettype>
-                        text
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype name="text/xml">
-                <label name="text/xml_label">
-                        XML
-                </label>
-                <widgettype>
-                        text
-                </widgettype>
-                <impl>
-                        LLMediaImplLLMozLib
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="video/mpeg">
-                <label name="video/mpeg_label">
-                        Movie (MPEG)
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-                <impl>
-                        LLMediaImplQuickTime
-                </impl>
-        </mimetype>
-        <mimetype name="video/mp4">
-                <label name="video/mp4_label">
-                        Movie (MP4)
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-                <impl>
-                        LLMediaImplQuickTime
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="video/quicktime">
-                <label name="video/quicktime_label">
-                        Movie (QuickTime)
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-                <impl>
-                        LLMediaImplQuickTime
-                </impl>
-        </mimetype>
-        <mimetype name="video/x-ms-asf">
-                <label name="video/x-ms-asf_label">
-                        Movie (Windows Media ASF)
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-                <impl>
-                        LLMediaImplQuickTime
-                </impl>
-        </mimetype>
-        <mimetype name="video/x-ms-wmv">
-                <label name="video/x-ms-wmv_label">
-                        Movie (Windows Media WMV)
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-                <impl>
-                        LLMediaImplQuickTime
-                </impl>
-        </mimetype>
-        <mimetype menu="1" name="video/x-msvideo">
-                <label name="video/x-msvideo_label">
-                        Movie (AVI)
-                </label>
-                <widgettype>
-                        movie
-                </widgettype>
-                <impl>
-                        LLMediaImplQuickTime
-                </impl>
-        </mimetype>
-</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
new file mode 100644
index 0000000..2977d7a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <defaultlabel>
+                (Unknown)
+        </defaultlabel>
+        <defaultwidget>
+                none
+        </defaultwidget>
+        <defaultimpl>
+                media_plugin_webkit
+        </defaultimpl>
+        <widgetset name="web">
+                <label name="web_label">
+                        Web Content
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        text/html
+                </default_type>
+                <tooltip name="web_tooltip">
+                        This location has Web content
+                </tooltip>
+                <playtip name="web_playtip">
+                        Show Web content
+                </playtip>
+                <allow_resize>
+                        true
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        Movie
+                </label>
+                <default_type>
+                        video/*
+                </default_type>
+                <icon>
+                        icn_media_movie.tga
+                </icon>
+                <tooltip name="movie_tooltip">
+                        There is a movie to play here
+                </tooltip>
+                <playtip name="movie_playtip">
+                        Play movie
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        Image
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        image/*
+                </default_type>
+                <tooltip name="image_tooltip">
+                        There is an image at this location
+                </tooltip>
+                <playtip name="image_playtip">
+                        View this location&apos;s image
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        Audio
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        audio/*
+                </default_type>
+                <tooltip name="audio_tooltip">
+                        There is audio at this location
+                </tooltip>
+                <playtip name="audio_playtip">
+                        Play this location&apos;s audio
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        Real Time Streaming
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        Audio
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        Video
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        Image
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer
+    </impl>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg Audio/Video
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        Rich Text (RTF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    Synchronized Multimedia Integration Language (SMIL)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        Web Page (XHTML)
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        Audio (MIDI)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        Audio (MP3)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        Audio (AIFF)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        Audio (WAV)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/bmp">
+                <label name="image/bmp_label">
+                        Image (BMP)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/gif">
+                <label name="image/gif_label">
+                        Image (GIF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/jpeg">
+                <label name="image/jpeg_label">
+                        Image (JPEG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/png">
+                <label name="image/png_label">
+                        Image (PNG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        Image (SVG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/tiff">
+                <label name="image/tiff_label">
+                        Image (TIFF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/html">
+                <label name="text/html_label">
+                        Web Page
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+      media_plugin_webkit
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/plain">
+                <label name="text/plain_label">
+                        Text
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/mpeg">
+                <label name="video/mpeg_label">
+                        Movie (MPEG)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer
+    </impl>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        Movie (MP4)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/quicktime">
+                <label name="video/quicktime_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer
+    </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        Movie (Windows Media ASF)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer
+    </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        Movie (Windows Media WMV)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        Movie (AVI)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_gstreamer
+    </impl>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
new file mode 100644
index 0000000..4a7a6e1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <defaultlabel>
+                (Unknown)
+        </defaultlabel>
+        <defaultwidget>
+                none
+        </defaultwidget>
+        <defaultimpl>
+                media_plugin_webkit
+        </defaultimpl>
+        <widgetset name="web">
+                <label name="web_label">
+                        Web Content
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        text/html
+                </default_type>
+                <tooltip name="web_tooltip">
+                        This location has Web content
+                </tooltip>
+                <playtip name="web_playtip">
+                        Show Web content
+                </playtip>
+                <allow_resize>
+                        true
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        Movie
+                </label>
+                <default_type>
+                        video/*
+                </default_type>
+                <icon>
+                        icn_media_movie.tga
+                </icon>
+                <tooltip name="movie_tooltip">
+                        There is a movie to play here
+                </tooltip>
+                <playtip name="movie_playtip">
+                        Play movie
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        Image
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        image/*
+                </default_type>
+                <tooltip name="image_tooltip">
+                        There is an image at this location
+                </tooltip>
+                <playtip name="image_playtip">
+                        View this location&apos;s image
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        Audio
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        audio/*
+                </default_type>
+                <tooltip name="audio_tooltip">
+                        There is audio at this location
+                </tooltip>
+                <playtip name="audio_playtip">
+                        Play this location&apos;s audio
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        Real Time Streaming
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        Audio
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        Video
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        Image
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg Audio/Video
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        Rich Text (RTF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    Synchronized Multimedia Integration Language (SMIL)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        Web Page (XHTML)
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        Audio (MIDI)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        Audio (MP3)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        Audio (AIFF)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        Audio (WAV)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/bmp">
+                <label name="image/bmp_label">
+                        Image (BMP)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/gif">
+                <label name="image/gif_label">
+                        Image (GIF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/jpeg">
+                <label name="image/jpeg_label">
+                        Image (JPEG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/png">
+                <label name="image/png_label">
+                        Image (PNG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        Image (SVG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/tiff">
+                <label name="image/tiff_label">
+                        Image (TIFF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/html">
+                <label name="text/html_label">
+                        Web Page
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+      media_plugin_webkit
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/plain">
+                <label name="text/plain_label">
+                        Text
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/mpeg">
+                <label name="video/mpeg_label">
+                        Movie (MPEG)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        Movie (MP4)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/quicktime">
+                <label name="video/quicktime_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        Movie (Windows Media ASF)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        Movie (Windows Media WMV)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        Movie (AVI)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
new file mode 100644
index 0000000..4a7a6e1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+        <defaultlabel>
+                (Unknown)
+        </defaultlabel>
+        <defaultwidget>
+                none
+        </defaultwidget>
+        <defaultimpl>
+                media_plugin_webkit
+        </defaultimpl>
+        <widgetset name="web">
+                <label name="web_label">
+                        Web Content
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        text/html
+                </default_type>
+                <tooltip name="web_tooltip">
+                        This location has Web content
+                </tooltip>
+                <playtip name="web_playtip">
+                        Show Web content
+                </playtip>
+                <allow_resize>
+                        true
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="movie">
+                <label name="movie_label">
+                        Movie
+                </label>
+                <default_type>
+                        video/*
+                </default_type>
+                <icon>
+                        icn_media_movie.tga
+                </icon>
+                <tooltip name="movie_tooltip">
+                        There is a movie to play here
+                </tooltip>
+                <playtip name="movie_playtip">
+                        Play movie
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <widgetset name="image">
+                <label name="image_label">
+                        Image
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        image/*
+                </default_type>
+                <tooltip name="image_tooltip">
+                        There is an image at this location
+                </tooltip>
+                <playtip name="image_playtip">
+                        View this location&apos;s image
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        false
+                </allow_looping>
+        </widgetset>
+        <widgetset name="audio">
+                <label name="audio_label">
+                        Audio
+                </label>
+                <icon>
+                        icn_media_web.tga
+                </icon>
+                <default_type>
+                        audio/*
+                </default_type>
+                <tooltip name="audio_tooltip">
+                        There is audio at this location
+                </tooltip>
+                <playtip name="audio_playtip">
+                        Play this location&apos;s audio
+                </playtip>
+                <allow_resize>
+                        false
+                </allow_resize>
+                <allow_looping>
+                        true
+                </allow_looping>
+        </widgetset>
+        <scheme name="rtsp">
+                <label name="rtsp_label">
+                        Real Time Streaming
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </scheme>
+        <mimetype name="blank">
+                <label name="blank_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="none/none">
+                <label name="none/none_label">
+                        - None -
+                </label>
+                <widgettype>
+                        none
+                </widgettype>
+        </mimetype>
+        <mimetype name="audio/*">
+                <label name="audio2_label">
+                        Audio
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+        </mimetype>
+        <mimetype name="video/*">
+                <label name="video2_label">
+                        Video
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+        </mimetype>
+        <mimetype name="image/*">
+                <label name="image2_label">
+                        Image
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+                <label name="vnd.secondlife.qt.legacy_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="application/javascript">
+                <label name="application/javascript_label">
+                        Javascript
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/ogg">
+                <label name="application/ogg_label">
+                        Ogg Audio/Video
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/pdf">
+                <label name="application/pdf_label">
+                        PDF Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/postscript">
+                <label name="application/postscript_label">
+                        Postscript Document
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/rtf">
+                <label name="application/rtf_label">
+                        Rich Text (RTF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/smil">
+                <label name="application/smil_label">
+                    Synchronized Multimedia Integration Language (SMIL)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="application/xhtml+xml">
+                <label name="application/xhtml+xml_label">
+                        Web Page (XHTML)
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+        </mimetype>
+        <mimetype name="application/x-director">
+                <label name="application/x-director_label">
+                        Macromedia Director
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+        </mimetype>
+        <mimetype name="audio/mid">
+                <label name="audio/mid_label">
+                        Audio (MIDI)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/mpeg">
+                <label name="audio/mpeg_label">
+                        Audio (MP3)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/x-aiff">
+                <label name="audio/x-aiff_label">
+                        Audio (AIFF)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="audio/x-wav">
+                <label name="audio/x-wav_label">
+                        Audio (WAV)
+                </label>
+                <widgettype>
+                        audio
+                </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/bmp">
+                <label name="image/bmp_label">
+                        Image (BMP)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/gif">
+                <label name="image/gif_label">
+                        Image (GIF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/jpeg">
+                <label name="image/jpeg_label">
+                        Image (JPEG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/png">
+                <label name="image/png_label">
+                        Image (PNG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="image/svg+xml">
+                <label name="image/svg+xml_label">
+                        Image (SVG)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="image/tiff">
+                <label name="image/tiff_label">
+                        Image (TIFF)
+                </label>
+                <widgettype>
+                        image
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/html">
+                <label name="text/html_label">
+                        Web Page
+                </label>
+                <widgettype>
+                        web
+                </widgettype>
+                <impl>
+      media_plugin_webkit
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="text/plain">
+                <label name="text/plain_label">
+                        Text
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype name="text/xml">
+                <label name="text/xml_label">
+                        XML
+                </label>
+                <widgettype>
+                        text
+                </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/mpeg">
+                <label name="video/mpeg_label">
+                        Movie (MPEG)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/mp4">
+                <label name="video/mp4_label">
+                        Movie (MP4)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/quicktime">
+                <label name="video/quicktime_label">
+                        Movie (QuickTime)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-asf">
+                <label name="video/x-ms-asf_label">
+                        Movie (Windows Media ASF)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype name="video/x-ms-wmv">
+                <label name="video/x-ms-wmv_label">
+                        Movie (Windows Media WMV)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+        <mimetype menu="1" name="video/x-msvideo">
+                <label name="video/x-msvideo_label">
+                        Movie (AVI)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+      media_plugin_quicktime
+    </impl>
+        </mimetype>
+</mimetypes>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
index 4a13604..aab98db 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml
@@ -15,7 +15,4 @@
                 <layout_panel auto_resize="false" filename="panel_toolbar.xml" name="toolbar"
                      use_bounding_rect="true" user_resize="false" width="1024" min_height="28" />
         </layout_stack>
-        <panel auto_resize="true" background_visible="false" bottom="50"
-             follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false"
-             name="hud" user_resize="false" width="1024" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml b/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml
new file mode 100644
index 0000000..95f8289
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_hud.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" auto_resize="true" background_visible="false" bottom="50"
+     follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false"
+     name="hud" user_resize="false" width="1024" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml
new file mode 100644
index 0000000..1c0781a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_hud.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" follows="" height="160" visible="false" mouse_opaque="false"  
+     label="" name="MediaHUD" width="208" background_visible="false" background_opaque="false" bg_alpha_color="1 1 1 0.0">
+<panel name="media_region" left="20" right="-20" bottom="35" top="-20" follows="left|right|top|bottom" visible="true" background_opaque="false"
+       mouse_opaque="false"/>
+        <!--icon name="bg_image" image_name="media_panel_hoverrectangle.png" visible="true" left="10" bottom="32" right="-10" top="-10" follows="left|right|top|bottom"/-->
+        <layout_stack orientation="horizontal" left="0" bottom="0" follows="left|right|bottom" visible="true" width="208" height="32">
+                <layout_panel user_resize="false"/>
+                <layout_panel user_resize="false" auto_resize="false" width="210" min_width="208">
+                        <panel name="media_focused_controls" width="208" left="0" height="32" bottom="0" visible="true">
+                                <icon name="media_panel_transportcontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="99" scale_image="true" bottom="0"/>
+                                <button name="back" label="" left="4" width="20" bottom="6" height="22" image_unselected="media_btn_back.png" 
+                                        image_selected="media_btn_back.png" scale_image="true"/>
+                                <icon name="media_panel_divider-1" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="20" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="fwd" label="" left_delta="3"  width="17" bottom_delta="0" height="22" image_unselected="media_btn_forward.png" 
+                                        image_selected="media_btn_forward.png" scale_image="true"/>
+                                <icon name="media_panel_divider-2" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="17" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="home" label="" left_delta="3"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_home.png" 
+                                        image_selected="media_btn_home.png" scale_image="true"/>
+        <button name="media_stop" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_stop.tga"
+                                        image_selected="button_anim_stop.tga" scale_image="true"/>
+        <icon name="media_panel_divider-3" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="reload" label="" left_delta="3"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_reload.png" 
+                                        image_selected="media_btn_reload.png" scale_image="true"/>
+                                <button name="stop" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_stoploading.png" 
+                                        image_selected="media_btn_stoploading.png" scale_image="true" visible="false"/>
+        <button name="play" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_play.tga"
+                                        image_selected="button_anim_play.tga" scale_image="true" visible="false"/>
+        <button name="pause" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_pause.tga"
+                                        image_selected="button_anim_pause.tga" scale_image="true" visible="false"/>
+        <icon name="media_panel_scrollbg" image_name="media_panel_scrollbg.png" visible="true" height="32" width="32" 
+                                        scale_image="false" bottom="0" left="97"/>
+                                <button name="scrollup" label="" left="109" width="8" bottom="20" height="8" image_unselected="media_btn_scrollup.png" 
+                                        image_selected="media_btn_scrollup.png" scale_image="false"/>
+                                <button name="scrollleft" label="" left="100" width="8" bottom="12" height="8" image_unselected="media_btn_scrollleft.png" 
+                                        image_selected="media_btn_scrollleft.png" scale_image="false"/>
+                                <button name="scrollright" label="" left="117" width="8" bottom="12" height="8" image_unselected="media_btn_scrollright.png" 
+                                        image_selected="media_btn_scrollright.png" scale_image="false"/>
+                                <button name="scrolldown" label="" left="109" width="8" bottom="4" height="8" image_unselected="media_btn_scrolldown.png" 
+                                        image_selected="media_btn_scrolldown.png" scale_image="false"/>
+                                <icon name="media_panel_metacontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="81" 
+                                        scale_image="true" bottom="0" left="127"/>
+                                <button name="zoom_frame" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" 
+                                        image_selected="media_btn_optimalzoom.png" scale_image="true"/>
+                                <icon name="media_panel_divider-4" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="new_window" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" 
+                                        image_selected="media_btn_newwindow.png" scale_image="true"/>
+                                <icon name="media_panel_divider-5" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="24" 
+                                        scale_image="false" bottom="5"/>
+                                <button name="close" label="" left_delta="3" width="21" bottom_delta="1" height="22" image_unselected="media_btn_done.png" 
+                                        image_selected="media_btn_done.png" scale_image="true"/>
+                        </panel>
+                        <panel name="media_hover_controls" width="57" left="74" height="32" bottom="0" visible="false">
+                                <icon name="media_panel_metacontrols_bg-hover" image_name="media_panel_bg.png" visible="true" height="32" width="57" scale_image="true" bottom="0" left="0"/>
+                                <button name="zoom_frame_hover" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" image_selected="media_btn_optimalzoom.png" 
+                                        scale_image="true"/>
+                                <icon name="media_panel_divider" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" scale_image="false" bottom="5"/>
+                                <button name="new_window_hover" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" image_selected="media_btn_newwindow.png" 
+                                        scale_image="true"/>
+                        </panel>
+    </layout_panel>
+                <layout_panel user_resize="false"/>
+        </layout_stack> 
+</panel>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 6b5e800..fcebda9 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -229,6 +229,12 @@ class WindowsManifest(ViewerManifest):
                 
         self.path("imprudence.url")
 
+        # Plugin host application
+        self.path(os.path.join(os.pardir,
+                               'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"),
+                  "SLPlugin.exe")
+
+
         self.path("featuretable.txt")
 
         # For use in crash reporting (generates minidumps)
@@ -251,7 +257,41 @@ class WindowsManifest(ViewerManifest):
             self.path("alut.dll")
             self.end_prefix()           
 
-        # Mozilla appears to force a dependency on these files so we need to ship it (CP) - updated to vc8 versions (nyx)
+
+        # Media plugins - QuickTime
+        if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
+            self.path("media_plugin_quicktime.dll")
+            self.end_prefix()
+
+        # Media plugins - WebKit/Qt
+        if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
+            self.path("media_plugin_webkit.dll")
+            self.end_prefix()
+            
+        # For WebKit/Qt plugin runtimes
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
+            self.path("libeay32.dll")
+            self.path("qtcore4.dll")
+            self.path("qtgui4.dll")
+            self.path("qtnetwork4.dll")
+            self.path("qtopengl4.dll")
+            self.path("qtwebkit4.dll")
+            self.path("ssleay32.dll")
+            self.end_prefix()
+
+        # For WebKit/Qt plugin runtimes (image format plugins)
+        if self.prefix(src="../../libraries/i686-win32/lib/release/imageformats", dst="llplugin/imageformats"):
+            self.path("qgif4.dll")
+            self.path("qico4.dll")
+            self.path("qjpeg4.dll")
+            self.path("qmng4.dll")
+            self.path("qsvg4.dll")
+            self.path("qtiff4.dll")
+            self.end_prefix()
+
+        # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
+        self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml")
+
         # These need to be installed as a SxS assembly, currently a 'private' assembly.
         # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
         if self.prefix(src=self.args['configuration'], dst=""):
@@ -278,34 +318,6 @@ class WindowsManifest(ViewerManifest):
         # same thing for auto-updater.
         #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="updater.exe.config")
 
-        # Mozilla runtime DLLs (CP)
-        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
-            self.path("freebl3.dll")
-            self.path("js3250.dll")
-            self.path("nspr4.dll")
-            self.path("nss3.dll")
-            self.path("nssckbi.dll")
-            self.path("plc4.dll")
-            self.path("plds4.dll")
-            self.path("smime3.dll")
-            self.path("softokn3.dll")
-            self.path("ssl3.dll")
-            self.path("xpcom.dll")
-            self.path("xul.dll")
-            self.end_prefix()
-
-        # Mozilla runtime misc files (CP)
-        if self.prefix(src="app_settings/mozilla"):
-            self.path("chrome/*.*")
-            self.path("components/*.*")
-            self.path("greprefs/*.*")
-            self.path("plugins/*.*")
-            self.path("res/*.*")
-            self.path("res/*/*")
-            self.end_prefix()
-
-        # Mozilla hack to get it to accept newer versions of msvc*80.dll than are listed in manifest
-        # necessary as llmozlib2-vc80.lib refers to an old version of msvc*80.dll - can be removed when new version of llmozlib is built - Nyx
         # Vivox runtimes
         if self.prefix(src="vivox-runtime/i686-win32", dst=""):
         #    self.path("alut.dll")
@@ -534,11 +546,8 @@ class DarwinManifest(ViewerManifest):
         self.path(self.args['configuration'] + "/Imprudence.app", dst="")
 
         if self.prefix(src="", dst="Contents"):  # everything goes in Contents
-            # Expand the tar file containing the assorted mozilla bits into
-            #  <bundle>/Contents/MacOS/
-            self.contents_of_tar(self.args['source']+'/mozilla-universal-darwin.tgz', 'MacOS')
-
-            self.path("Info-Imprudence.plist", dst="Info.plist")
+            
+            self.path("Info-Imprudence.plist", dst="Info.plist")
 
             # copy additional libs in <bundle>/Contents/MacOS/
             if self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"):
@@ -590,12 +599,6 @@ class DarwinManifest(ViewerManifest):
 
                 self.end_prefix("../../libraries/universal-darwin/lib_release")
 
-            # replace the default theme with our custom theme (so scrollbars work).
-            if self.prefix(src="mozilla-theme", dst="MacOS/chrome"):
-                self.path("classic.jar")
-                self.path("classic.manifest")
-                self.end_prefix("MacOS/chrome")
-
             # most everything goes in the Resources directory
             if self.prefix(src="", dst="Resources"):
                 super(DarwinManifest, self).construct()
@@ -723,7 +726,21 @@ class DarwinManifest(ViewerManifest):
                 # our apps
 #                self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
                 self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app")
+                
+                # plugin launcher
+                self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin")
+
+                # plugins
+                if self.prefix(src="", dst="llplugin"):
+                    self.path("../media_plugins/quicktime/" + self.args['configuration'] + "/media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib")
+                    self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib")
+                    self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
+
+                    self.end_prefix("llplugin")
 
+                # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
+                self.path("skins/default/xui/en-us/mime_types_mac.xml", "skins/default/xui/en-us/mime_types.xml")
+ 
                 # command line arguments for connecting to the proper grid
                 self.put_in_file(self.flags_list(), 'arguments.txt')
 
@@ -766,7 +783,7 @@ class DarwinManifest(ViewerManifest):
         # make sure we don't have stale files laying about
         self.remove(sparsename, finalname)
 
-        self.run_command('hdiutil create "%(sparse)s" -volname "%(vol)s" -fs HFS+ -type SPARSE -megabytes 300 -layout SPUD' % {
+        self.run_command('hdiutil create "%(sparse)s" -volname "%(vol)s" -fs HFS+ -type SPARSE -megabytes 400 -layout SPUD' % {
                 'sparse':sparsename,
                 'vol':volname})
 
@@ -851,6 +868,23 @@ class LinuxManifest(ViewerManifest):
 
         # Create an appropriate gridargs.dat for this package, denoting required grid.
         self.put_in_file(self.flags_list(), 'gridargs.dat')
+        self.path("linux_tools/launch_url.sh","launch_url.sh")
+        self.path("../llplugin/slplugin/SLPlugin", "bin/SLPlugin")
+        if self.prefix("res-sdl"):
+            self.path("*")
+            # recurse
+            self.end_prefix("res-sdl")
+
+        # plugins
+        if self.prefix(src="", dst="bin/llplugin"):
+            self.path("../media_plugins/webkit/libmedia_plugin_webkit.so", "libmedia_plugin_webkit.so")
+            self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so")
+            self.end_prefix("bin/llplugin")
+
+        # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
+        self.path("skins/default/xui/en-us/mime_types_linux.xml", "skins/default/xui/en-us/mime_types.xml")
+
+        self.path("featuretable_linux.txt")
 
 
     def package_finish(self):
@@ -904,17 +938,7 @@ class Linux_i686Manifest(LinuxManifest):
     def construct(self):
         super(Linux_i686Manifest, self).construct()
         self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
-#        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
-        self.path("linux_tools/launch_url.sh","launch_url.sh")
-        if self.prefix("res-sdl"):
-            self.path("*")
-            # recurse
-            self.end_prefix("res-sdl")
-
-        self.path("featuretable_linux.txt")
-        #self.path("secondlife-i686.supp")
 
-        self.path("app_settings/mozilla-runtime-linux-i686")
 
         if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
             self.path("libapr-1.so.0")
diff --git a/linden/indra/newview/viewer_manifest.py~ b/linden/indra/newview/viewer_manifest.py~
new file mode 100755
index 0000000..452b165
--- /dev/null
+++ b/linden/indra/newview/viewer_manifest.py~
@@ -0,0 +1,1176 @@
+#!/usr/bin/python
+# @file viewer_manifest.py
+# @author Ryan Williams
+# @brief Description of all installer viewer files, and methods for packaging
+#        them into installers for all supported platforms.
+#
+# $LicenseInfo:firstyear=2006&license=viewergpl$
+# 
+# Copyright (c) 2006-2009, Linden Research, Inc.
+# 
+# Second Life Viewer Source Code
+# The source code in this file ("Source Code") is provided by Linden Lab
+# to you under the terms of the GNU General Public License, version 2.0
+# ("GPL"), unless you have obtained a separate licensing agreement
+# ("Other License"), formally executed by you and Linden Lab.  Terms of
+# the GPL can be found in doc/GPL-license.txt in this distribution, or
+# online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+# 
+# There are special exceptions to the terms and conditions of the GPL as
+# it is applied to this Source Code. View the full text of the exception
+# in the file doc/FLOSS-exception.txt in this software distribution, or
+# online at
+# http://secondlifegrid.net/programs/open_source/licensing/flossexception
+# 
+# By copying, modifying or distributing this software, you acknowledge
+# that you have read and understood your obligations described above,
+# and agree to abide by those obligations.
+# 
+# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+# COMPLETENESS OR PERFORMANCE.
+# $/LicenseInfo$
+
+# DO NOT RUN THIS FILE DIRECTLY
+# Instead, run develop.py with "configure -DPACKAGE:BOOL=ON" e.g.:
+#   develop.py -G vc80 configure -DPACKAGE:BOOL=ON
+# to generate the "package" project in Visual Studio 2005
+# Note: as of Imprudence 1.3, this defaults to on for Windows
+
+import sys
+import os.path
+import re
+import tarfile
+viewer_dir = os.path.dirname(__file__)
+# add llmanifest library to our path so we don't have to muck with PYTHONPATH
+sys.path.append(os.path.join(viewer_dir, '../lib/python/indra/util'))
+from llmanifest import LLManifest, main, proper_windows_path, path_ancestors
+
+class ViewerManifest(LLManifest):
+    def construct(self):
+        super(ViewerManifest, self).construct()
+        self.exclude("*.svn*")
+        self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
+        self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
+
+        if self.prefix(src="app_settings"):
+            self.exclude("logcontrol.xml")
+            self.exclude("logcontrol-dev.xml")
+            self.path("*.pem")
+            self.path("*.ini")
+            self.path("*.xml")
+            self.path("*.db2")
+
+            # include the entire shaders directory recursively
+            self.path("shaders")
+            # ... and the entire windlight directory
+            self.path("windlight")
+            self.end_prefix("app_settings")
+
+        if self.prefix(src="character"):
+            self.path("*.llm")
+            self.path("*.xml")
+            self.path("*.tga")
+            self.end_prefix("character")
+
+        # Include our fonts
+        if self.prefix(src="fonts"):
+            self.path("LiberationSans-Bold.ttf")
+            self.path("LiberationSans-Regular.ttf")
+            self.path("VeraMono.ttf")
+            self.path("DejaVuSansCondensed-BoldOblique.ttf")
+            self.path("DejaVuSansCondensed-Bold.ttf")
+            self.path("DejaVuSansCondensed-Oblique.ttf")
+            self.path("DejaVuSansCondensed.ttf")
+            self.path("GPL.txt")
+            self.path("Liberation-License.txt")
+            self.path("Vera-License.txt")
+            self.end_prefix("fonts")
+
+        # skins
+        if self.prefix(src="skins"):
+                self.path("paths.xml")
+                # include the entire textures directory recursively
+                if self.prefix(src="*/textures"):
+                        self.path("*.tga")
+                        self.path("*.j2c")
+                        self.path("*.jpg")
+                        self.path("*.png")
+                        self.path("textures.xml")
+                        self.end_prefix("*/textures")
+                self.path("*/xui/*/*.xml")
+                self.path("*/*.xml")
+                
+                # Local HTML files (e.g. loading screen)
+                if self.prefix(src="*/html"):
+                        self.path("*.png")
+                        self.path("*/*/*.html")
+                        self.path("*/*/*.gif")
+                        self.path("*/*/*.png")
+                        self.end_prefix("*/html")
+                self.end_prefix("skins")
+        
+        # Files in the newview/ directory
+        self.path("gpu_table.txt")
+
+
+    # Gather up the README file, etc.
+    def gather_documents(self):
+        # From the top level directory (imprudence)
+        if self.prefix("../../..", dst=""):
+            self.path("README.txt")
+            self.path("MANIFESTO.txt")
+            self.path("CONTRIBUTE.txt")
+            self.path("RELEASE_NOTES.txt")
+            self.path("ChangeLog.txt", required=False)
+            self.end_prefix("../../..")
+
+        # From the linden directory
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-source.txt")
+            self.path("LICENSE-logos.txt", "LICENSE-artwork.txt")
+            self.end_prefix("../..")
+
+        # From the linden/doc directory
+        if self.prefix("../../doc", dst="doc"):
+            self.path("contributions.txt")
+            self.path("GPL-license.txt", "GPL.txt")
+            self.path("FLOSS-exception.txt")
+            self.end_prefix("../../doc")
+
+
+    def login_channel(self):
+        """Channel reported for login and upgrade purposes ONLY;
+        used for A/B testing"""
+        # NOTE: Do not return the normal channel if login_channel
+        # is not specified, as some code may branch depending on
+        # whether or not this is present
+        return self.args.get('login_channel')
+
+    def grid(self):
+        return self.args['grid']
+    def channel(self):
+        return self.args['channel']
+    def channel_unique(self):
+        return self.channel().replace("Imprudence", "").strip()
+    def channel_oneword(self):
+        return "".join(self.channel_unique().split())
+    def channel_lowerword(self):
+        return self.channel_oneword().lower()
+
+    def flags_list(self):
+        """ Convenience function that returns the command-line flags
+        for the grid"""
+
+        # Set command line flags relating to the target grid
+        grid_flags = ''
+        if not self.default_grid():
+            grid_flags = "--grid %(grid)s "\
+                         "--helperuri http://preview-%(grid)s.secondlife.com/helpers/" %\
+                           {'grid':self.grid()}
+
+        # set command line flags for channel
+        channel_flags = ''
+        if self.login_channel() and self.login_channel() != self.channel():
+            # Report a special channel during login, but use default
+            channel_flags = '--channel "%s"' % (self.login_channel())
+        elif not self.default_channel():
+            channel_flags = '--channel "%s"' % self.channel()
+
+        # Deal with settings 
+        setting_flags = ''
+        if not self.default_channel() or not self.default_grid():
+            if self.default_grid():
+                setting_flags = '--settings settings_%s.xml'\
+                                % self.channel_lowerword()
+            else:
+                setting_flags = '--settings settings_%s_%s.xml'\
+                                % (self.grid(), self.channel_lowerword())
+                                                
+        return " ".join((channel_flags, grid_flags, setting_flags)).strip()
+
+
+class WindowsManifest(ViewerManifest):
+    def final_exe(self):
+        if self.default_channel():
+            if self.default_grid():
+                return "imprudence.exe"
+            else:
+                return "imprudencepreview.exe"
+        else:
+            return ''.join(self.channel().split()) + '.exe'
+
+
+    def construct(self):
+        super(WindowsManifest, self).construct()
+        # the final exe is complicated because we're not sure where it's coming from,
+        # nor do we have a fixed name for the executable
+        self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe())
+
+        self.gather_documents()
+
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries.txt")
+            self.end_prefix("../..")
+
+                
+        self.path("imprudence.url")
+
+        # Plugin host application
+        self.path(os.path.join(os.pardir,
+                               'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"),
+                  "SLPlugin.exe")
+
+
+        self.path("featuretable.txt")
+
+        # For use in crash reporting (generates minidumps)
+        self.path("dbghelp.dll")
+
+        # For using FMOD for sound... DJS
+        #self.path("fmod.dll")
+        
+        # For spellchecking
+        self.path("libhunspell.dll")
+
+        # For textures
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("openjpeg.dll")
+            self.end_prefix()
+
+        # For sound
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("openal32.dll")
+            self.path("alut.dll")
+            self.end_prefix()           
+
+
+        # Media plugins - QuickTime
+        if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
+            self.path("media_plugin_quicktime.dll")
+            self.end_prefix()
+
+        # Media plugins - WebKit/Qt
+        if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
+            self.path("media_plugin_webkit.dll")
+            self.end_prefix()
+            
+        # For WebKit/Qt plugin runtimes
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
+            self.path("libeay32.dll")
+            self.path("qtcore4.dll")
+            self.path("qtgui4.dll")
+            self.path("qtnetwork4.dll")
+            self.path("qtopengl4.dll")
+            self.path("qtwebkit4.dll")
+            self.path("ssleay32.dll")
+            self.end_prefix()
+
+        # For WebKit/Qt plugin runtimes (image format plugins)
+        if self.prefix(src="../../libraries/i686-win32/lib/release/imageformats", dst="llplugin/imageformats"):
+            self.path("qgif4.dll")
+            self.path("qico4.dll")
+            self.path("qjpeg4.dll")
+            self.path("qmng4.dll")
+            self.path("qsvg4.dll")
+            self.path("qtiff4.dll")
+            self.end_prefix()
+
+        # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
+        self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml")
+
+        # These need to be installed as a SxS assembly, currently a 'private' assembly.
+        # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
+        if self.prefix(src=self.args['configuration'], dst=""):
+            if self.args['configuration'] == 'Debug':
+                self.path("msvcr80d.dll")
+                self.path("msvcp80d.dll")
+                self.path("Microsoft.VC80.DebugCRT.manifest")
+            else:
+                self.path("msvcr80.dll")
+                self.path("msvcp80.dll")
+                self.path("Microsoft.VC80.CRT.manifest")
+            self.end_prefix()
+
+        # The config file name needs to match the exe's name.
+        self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
+
+        # We need this one too, so that llkdu loads at runtime - DEV-41194
+        #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config")
+        self.path("llkdu.dll.2.config")
+
+        # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004
+        #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config")
+
+        # same thing for auto-updater.
+        #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="updater.exe.config")
+
+        # Vivox runtimes
+        if self.prefix(src="vivox-runtime/i686-win32", dst=""):
+        #    self.path("alut.dll")
+            self.path("wrap_oal.dll")
+            self.path("SLVoice.exe")
+        #    self.path("SLVoiceAgent.exe")
+        #    self.path("libeay32.dll")
+        #    self.path("srtp.dll")
+        #    self.path("ssleay32.dll")
+        #    self.path("tntk.dll")
+            self.path("vivoxsdk.dll")
+            self.path("ortp.dll")
+
+            self.end_prefix()
+
+        # Gstreamer plugins
+        if self.prefix(src="lib/gstreamer-plugins", dst=""):
+            self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
+            self.end_prefix()
+
+        # Gstreamer libs
+        if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("iconv.dll")
+            self.path("libxml2.dll")
+            self.path("libcairo-2.dll")
+            self.path("libgio-2.0-0.dll")
+            self.path("libglib-2.0-0.dll")
+            self.path("libgmodule-2.0-0.dll")
+            self.path("libgobject-2.0-0.dll")
+            self.path("libgthread-2.0-0.dll")
+            self.path("charset.dll")
+            self.path("intl.dll")
+            self.path("libgcrypt-11.dll")
+            self.path("libgnutls-26.dll")
+            self.path("libgpg-error-0.dll")
+            self.path("libgstapp.dll")
+            self.path("libgstaudio.dll")
+            self.path("libgstbase-0.10.dll")
+            self.path("libgstcdda.dll")
+            self.path("libgstcontroller-0.10.dll")
+            self.path("libgstdataprotocol-0.10.dll")
+            self.path("libgstdshow.dll")
+            self.path("libgstfft.dll")
+            self.path("libgstinterfaces.dll")
+            self.path("libgstnet-0.10.dll")
+            self.path("libgstnetbuffer.dll")
+            self.path("libgstpbutils.dll")
+            self.path("libgstreamer-0.10.dll")
+            self.path("libgstriff.dll")
+            self.path("libgstrtp.dll")
+            self.path("libgstrtsp.dll")
+            self.path("libgstsdp.dll")
+            self.path("libgsttag.dll")
+            self.path("libgstvideo.dll")
+            self.path("libjpeg.dll")
+            self.path("libmp3lame-0.dll")
+            self.path("libneon-27.dll")
+            self.path("libogg-0.dll")
+            self.path("liboil-0.3-0.dll")
+            self.path("libopenjpeg-2.dll")
+            self.path("libpng12-0.dll")
+            self.path("libschroedinger-1.0-0.dll")
+            self.path("libspeex-1.dll")
+            self.path("libtheora-0.dll")
+            self.path("libvorbis-0.dll")
+            self.path("libvorbisenc-2.dll")
+            self.path("libxml2-2.dll")
+            self.path("glew32.dll")
+            self.path("xvidcore.dll")
+            self.path("zlib1.dll")
+            self.end_prefix()            
+
+#        # pull in the crash logger and updater from other projects
+#        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
+#                "../win_crash_logger/debug/windows-crash-logger.exe",
+#                "../win_crash_logger/release/windows-crash-logger.exe",
+#                "../win_crash_logger/relwithdebinfo/windows-crash-logger.exe"),
+#                  dst="win_crash_logger.exe")
+        self.path(src=self.find_existing_file(
+                "../win_updater/debug/windows-updater.exe",
+                "../win_updater/release/windows-updater.exe",
+                "../win_updater/relwithdebinfo/windows-updater.exe"),
+                  dst="updater.exe")
+
+        # For google-perftools tcmalloc allocator.
+        #if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+        #        self.path("libtcmalloc_minimal.dll")
+        #        self.end_prefix()
+
+
+    def nsi_file_commands(self, install=True):
+        def wpath(path):
+            if path.endswith('/') or path.endswith(os.path.sep):
+                path = path[:-1]
+            path = path.replace('/', '\\')
+            return path
+
+        result = ""
+        dest_files = [pair[1] for pair in self.file_list if pair[0] and os.path.isfile(pair[1])]
+        # sort deepest hierarchy first
+        dest_files.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b))
+        dest_files.reverse()
+        out_path = None
+        for pkg_file in dest_files:
+            rel_file = os.path.normpath(pkg_file.replace(self.get_dst_prefix()+os.path.sep,''))
+            installed_dir = wpath(os.path.join('$INSTDIR', os.path.dirname(rel_file)))
+            pkg_file = wpath(os.path.normpath(pkg_file))
+            if installed_dir != out_path:
+                if install:
+                    out_path = installed_dir
+                    result += 'SetOutPath ' + out_path + '\n'
+            if install:
+                result += 'File ' + pkg_file + '\n'
+            else:
+                result += 'Delete ' + wpath(os.path.join('$INSTDIR', rel_file)) + '\n'
+        # at the end of a delete, just rmdir all the directories
+        if not install:
+            deleted_file_dirs = [os.path.dirname(pair[1].replace(self.get_dst_prefix()+os.path.sep,'')) for pair in self.file_list]
+            # find all ancestors so that we don't skip any dirs that happened to have no non-dir children
+            deleted_dirs = []
+            for d in deleted_file_dirs:
+                deleted_dirs.extend(path_ancestors(d))
+            # sort deepest hierarchy first
+            deleted_dirs.sort(lambda a,b: cmp(a.count(os.path.sep),b.count(os.path.sep)) or cmp(a,b))
+            deleted_dirs.reverse()
+            prev = None
+            for d in deleted_dirs:
+                if d != prev:   # skip duplicates
+                    result += 'RMDir ' + wpath(os.path.join('$INSTDIR', os.path.normpath(d))) + '\n'
+                prev = d
+
+        return result
+
+    def package_finish(self):
+        # a standard map of strings for replacing in the templates
+        substitution_strings = {
+            'version' : '.'.join(self.args['version']).replace(' ', '_'),
+            'version_short' : '.'.join(self.args['version'][:-1]).replace(' ', '_'),
+            'version_dashes' : '-'.join(self.args['version']).replace(' ', '_'),
+            'final_exe' : self.final_exe(),
+            'grid':self.args['grid'],
+            'grid_caps':self.args['grid'].upper(),
+            # escape quotes becase NSIS doesn't handle them well
+            'flags':self.flags_list().replace('"', '$\\"'),
+            'channel':self.channel(),
+            'channel_oneword':self.channel_oneword(),
+            'channel_unique':self.channel_unique(),
+            }
+
+        version_vars = """
+        !define INSTEXE  "%(final_exe)s"
+        !define VERSION "%(version_short)s"
+        !define VERSION_LONG "%(version)s"
+        !define VERSION_DASHES "%(version_dashes)s"
+        """ % substitution_strings
+        if self.default_channel():
+            if self.default_grid():
+                # release viewer
+                installer_file = "Imprudence_%(version_dashes)s_Setup.exe"
+                grid_vars_template = """
+                OutFile "%(installer_file)s"
+                !define INSTFLAGS "%(flags)s"
+                !define INSTNAME   "Imprudence"
+                !define SHORTCUT   "Imprudence"
+                !define URLNAME   "imprudence"
+                Caption "Imprudence ${VERSION}"
+                """
+            else:
+                # beta grid viewer
+                installer_file = "Imprudence_%(version_dashes)s_(%(grid_caps)s)_Setup.exe"
+                grid_vars_template = """
+                OutFile "%(installer_file)s"
+                !define INSTFLAGS "%(flags)s"
+                !define INSTNAME   "Imprudence%(grid_caps)s"
+                !define SHORTCUT   "Imprudence (%(grid_caps)s)"
+                !define URLNAME   "imprudence%(grid)s"
+                !define UNINSTALL_SETTINGS 1
+                Caption "Imprudence %(grid)s ${VERSION}"
+                """
+        else:
+            # some other channel on some grid
+            installer_file = "Imprudence_%(version_dashes)s_%(channel_oneword)s_Setup.exe"
+            grid_vars_template = """
+            OutFile "%(installer_file)s"
+            !define INSTFLAGS "%(flags)s"
+            !define INSTNAME   "Imprudence%(channel_oneword)s"
+            !define SHORTCUT   "%(channel)s"
+            !define URLNAME   "imprudence"
+            !define UNINSTALL_SETTINGS 1
+            Caption "%(channel)s ${VERSION}"
+            """
+        if 'installer_name' in self.args:
+            installer_file = self.args['installer_name']
+        else:
+            installer_file = installer_file % substitution_strings
+        substitution_strings['installer_file'] = installer_file
+
+        tempfile = "imprudence_setup_tmp.nsi"
+        # the following replaces strings in the nsi template
+        # it also does python-style % substitution
+        self.replace_in("installers/windows/installer_template.nsi", tempfile, {
+                "%%VERSION%%":version_vars,
+                "%%SOURCE%%":self.get_src_prefix(),
+                "%%GRID_VARS%%":grid_vars_template % substitution_strings,
+                "%%INSTALL_FILES%%":self.nsi_file_commands(True),
+                "%%DELETE_FILES%%":self.nsi_file_commands(False)})
+
+        # We use the Unicode version of NSIS, available from
+        # http://www.scratchpaper.com/
+        NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'
+        self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+        # self.remove(self.dst_path_of(tempfile))
+        # If we're on a build machine, sign the code using our Authenticode certificate. JC
+        sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
+        if os.path.exists(sign_py):
+            self.run_command(sign_py + ' ' + self.dst_path_of(installer_file))
+        else:
+            print "Skipping code signing,", sign_py, "does not exist"
+        self.created_path(self.dst_path_of(installer_file))
+        self.package_file = installer_file
+
+
+class DarwinManifest(ViewerManifest):
+    def construct(self):
+        # copy over the build result (this is a no-op if run within the xcode script)
+        self.path(self.args['configuration'] + "/Imprudence.app", dst="")
+
+        if self.prefix(src="", dst="Contents"):  # everything goes in Contents
+            
+            self.path("Info-Imprudence.plist", dst="Info.plist")
+
+            # copy additional libs in <bundle>/Contents/MacOS/
+            if self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"):
+
+                self.path("libndofdev.dylib")
+                
+                self.path("libopenal.1.dylib")
+                self.path("libalut.0.dylib")
+
+                self.path("libglib-2.0.dylib")
+                self.path("libgmodule-2.0.dylib")
+                self.path("libgobject-2.0.dylib")
+                self.path("libgthread-2.0.dylib")
+                
+                self.path("libgstreamer-0.10.dylib")
+                self.path("libgstapp-0.10.dylib")
+                self.path("libgstaudio-0.10.dylib")
+                self.path("libgstbase-0.10.dylib")
+                self.path("libgstcdda-0.10.dylib")
+                self.path("libgstcontroller-0.10.dylib")
+                self.path("libgstdataprotocol-0.10.dylib")
+                self.path("libgstfft-0.10.dylib")
+                self.path("libgstinterfaces-0.10.dylib")
+                self.path("libgstnet-0.10.dylib")
+                self.path("libgstnetbuffer-0.10.dylib")
+                self.path("libgstpbutils-0.10.dylib")
+                self.path("libgstriff-0.10.dylib")
+                self.path("libgstrtp-0.10.dylib")
+                self.path("libgstrtsp-0.10.dylib")
+                self.path("libgstsdp-0.10.dylib")
+                self.path("libgsttag-0.10.dylib")
+                self.path("libgstvideo-0.10.dylib")
+
+                self.path("libxml2.2.dylib")
+                self.path("libfaad.2.dylib")
+                self.path("libFLAC.8.dylib")
+                self.path("libintl.3.dylib")
+                self.path("libjpeg.62.dylib")
+                self.path("libpng12.0.dylib")
+                self.path("libneon.27.dylib")
+                self.path("libogg.0.dylib")
+                self.path("liboil-0.3.0.dylib")
+                self.path("libopenjpeg.1.4.dylib")
+                self.path("libtheora.0.dylib")
+                self.path("libvorbis.0.dylib")
+                self.path("libvorbisenc.2.dylib")
+                self.path("libvorbisfile.3.dylib")
+
+                self.end_prefix("../../libraries/universal-darwin/lib_release")
+
+            # most everything goes in the Resources directory
+            if self.prefix(src="", dst="Resources"):
+                super(DarwinManifest, self).construct()
+
+                if self.prefix("cursors_mac"):
+                    self.path("*.tif")
+                    self.end_prefix("cursors_mac")
+
+                # From the linden directory
+                if self.prefix("../..", dst="doc"):
+                    self.path("LICENSE-libraries.txt")
+                    self.end_prefix("../..")
+
+                self.gather_documents()
+
+                self.path("featuretable_mac.txt")
+                self.path("SecondLife.nib")
+
+                self.path("viewer.icns")
+                
+                # Translations
+                self.path("English.lproj")
+                self.path("German.lproj")
+                self.path("Japanese.lproj")
+                self.path("Korean.lproj")
+                self.path("da.lproj")
+                self.path("es.lproj")
+                self.path("fr.lproj")
+                self.path("hu.lproj")
+                self.path("it.lproj")
+                self.path("nl.lproj")
+                self.path("pl.lproj")
+                self.path("pt.lproj")
+                self.path("ru.lproj")
+                self.path("tr.lproj")
+                self.path("uk.lproj")
+                self.path("zh-Hans.lproj")
+
+
+                if self.prefix(src="../../libraries/universal-darwin/lib_release/gstreamer-plugins", dst="lib/gstreamer-plugins"):
+                    self.path("libgstaacparse.so")
+                    self.path("libgstadder.so")
+                    self.path("libgstaiffparse.so")
+                    self.path("libgstamrparse.so")
+                    self.path("libgstapp.so")
+                    self.path("libgstaudioconvert.so")
+                    self.path("libgstaudiorate.so")
+                    self.path("libgstaudioresample.so")
+                    self.path("libgstautodetect.so")
+                    self.path("libgstavi.so")
+                    self.path("libgstcoreelements.so")
+                    self.path("libgstcoreindexers.so")
+                    self.path("libgstdebug.so")
+                    self.path("libgstdecodebin.so")
+                    self.path("libgstdecodebin2.so")
+                    self.path("libgstdeinterlace2.so")
+                    self.path("libgstequalizer.so")
+                    self.path("libgstfaad.so")
+                    self.path("libgstffmpeg.so")
+                    self.path("libgstffmpegcolorspace.so")
+                    self.path("libgstffmpegscale.so")
+                    self.path("libgstfilter.so")
+                    self.path("libgstflac.so")
+                    self.path("libgstflv.so")
+                    self.path("libgstgdp.so")
+                    self.path("libgsth264parse.so")
+                    self.path("libgsticydemux.so")
+                    self.path("libgstid3demux.so")
+                    self.path("libgstinterleave.so")
+                    self.path("libgstjpeg.so")
+                    self.path("libgstlevel.so")
+                    self.path("libgstmetadata.so")
+                    self.path("libgstmpeg4videoparse.so")
+                    self.path("libgstmpegdemux.so")
+                    self.path("libgstmpegvideoparse.so")
+                    self.path("libgstmultifile.so")
+                    self.path("libgstmultipart.so")
+                    self.path("libgstneonhttpsrc.so")
+                    self.path("libgstogg.so")
+                    self.path("libgstosxaudio.so")
+                    self.path("libgstosxvideosink.so")
+                    self.path("libgstplaybin.so")
+                    self.path("libgstpng.so")
+                    self.path("libgstpostproc.so")
+                    self.path("libgstqtdemux.so")
+                    #self.path("libgstqtwrapper.so")
+                    self.path("libgstqueue2.so")
+                    self.path("libgstreal.so")
+                    self.path("libgstrtp.so")
+                    self.path("libgstrtpmanager.so")
+                    self.path("libgstrtsp.so")
+                    self.path("libgstsdpelem.so")
+                    self.path("libgstselector.so")
+                    self.path("libgststereo.so")
+                    self.path("libgsttcp.so")
+                    self.path("libgsttheora.so")
+                    self.path("libgsttypefindfunctions.so")
+                    self.path("libgstudp.so")
+                    self.path("libgstvideobalance.so")
+                    self.path("libgstvideobox.so")
+                    self.path("libgstvideocrop.so")
+                    self.path("libgstvideoflip.so")
+                    self.path("libgstvideomixer.so")
+                    self.path("libgstvideorate.so")
+                    self.path("libgstvideoscale.so")
+                    self.path("libgstvideosignal.so")
+                    self.path("libgstvolume.so")
+                    self.path("libgstvorbis.so")
+                    self.path("libgstwavparse.so")
+                    
+                    self.end_prefix("../../libraries/universal-darwin/lib_release/gstreamer-plugins")
+
+
+                # SLVoice and vivox lols
+                self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib")
+                self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib")
+                self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
+                self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
+                self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
+                #self.path("vivox-runtime/universal-darwin/SLVoiceAgent.app", "SLVoiceAgent.app")
+
+                #libfmodwrapper.dylib
+                #self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+                
+                # our apps
+#                self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
+                self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app")
+                
+                # plugin launcher
+                self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin")
+
+                # plugins
+                if self.prefix(src="", dst="llplugin"):
+                    self.path("../media_plugins/quicktime/" + self.args['configuration'] + "/media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib")
+                    self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib")
+                    self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
+
+                    self.end_prefix("llplugin")
+
+                # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
+                self.path("skins/default/xui/en-us/mime_types_mac.xml", "skins/default/xui/en-us/mime_types.xml")
+ 
+                # command line arguments for connecting to the proper grid
+                self.put_in_file(self.flags_list(), 'arguments.txt')
+
+                self.end_prefix("Resources")
+
+            self.end_prefix("Contents")
+
+        # NOTE: the -S argument to strip causes it to keep enough info for
+        # annotated backtraces (i.e. function names in the crash log).  'strip' with no
+        # arguments yields a slightly smaller binary but makes crash logs mostly useless.
+        # This may be desirable for the final release.  Or not.
+        if ("package" in self.args['actions'] or 
+            "unpacked" in self.args['actions']):
+            self.run_command('strip -S "%(viewer_binary)s"' %
+                             { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
+
+
+    def package_finish(self):
+        channel_standin = 'Imprudence'  # hah, our default channel is not usable on its own
+        if not self.default_channel():
+            channel_standin = self.channel()
+
+        imagename="Imprudence_" + '_'.join(self.args['version'])
+
+        # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning.
+        #  If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick.
+
+        volname="Imprudence Installer"  # DO NOT CHANGE without understanding comment above
+
+        if self.default_channel():
+            if not self.default_grid():
+                # beta case
+                imagename = imagename + '_' + self.args['grid'].upper()
+        else:
+            # first look, etc
+            imagename = imagename + '_' + self.channel_oneword().upper()
+
+        sparsename = imagename + ".sparseimage"
+        finalname = imagename + ".dmg"
+        # make sure we don't have stale files laying about
+        self.remove(sparsename, finalname)
+
+        self.run_command('hdiutil create "%(sparse)s" -volname "%(vol)s" -fs HFS+ -type SPARSE -megabytes 400 -layout SPUD' % {
+                'sparse':sparsename,
+                'vol':volname})
+
+        # mount the image and get the name of the mount point and device node
+        hdi_output = self.run_command('hdiutil attach -private "' + sparsename + '"')
+        devfile = re.search("/dev/disk([0-9]+)[^s]", hdi_output).group(0).strip()
+        volpath = re.search('HFS\s+(.+)', hdi_output).group(1).strip()
+
+        # Copy everything in to the mounted .dmg
+
+        if self.default_channel() and not self.default_grid():
+            app_name = "Imprudence " + self.args['grid']
+        else:
+            app_name = channel_standin.strip()
+
+        # Hack:
+        # Because there is no easy way to coerce the Finder into positioning
+        # the app bundle in the same place with different app names, we are
+        # adding multiple .DS_Store files to svn. There is one for release,
+        # one for release candidate and one for first look. Any other channels
+        # will use the release .DS_Store, and will look broken.
+        # - Ambroff 2008-08-20
+        dmg_template = os.path.join(
+            'installers', 
+            'darwin',
+            '%s-dmg' % "".join(self.channel_unique().split()).lower())
+
+        if not os.path.exists (self.src_path_of(dmg_template)):
+            dmg_template = os.path.join ('installers', 'darwin', 'release-dmg')
+
+        for s,d in {self.get_dst_prefix():app_name + ".app",
+                    os.path.join(dmg_template, "_VolumeIcon.icns"): ".VolumeIcon.icns",
+                    os.path.join(dmg_template, "background.jpg"): "background.jpg",
+                    os.path.join(dmg_template, "_DS_Store"): ".DS_Store"}.items():
+            print "Copying to dmg", s, d
+            self.copy_action(self.src_path_of(s), os.path.join(volpath, d))
+
+        # Hide the background image, DS_Store file, and volume icon file (set their "visible" bit)
+        self.run_command('SetFile -a V "' + os.path.join(volpath, ".VolumeIcon.icns") + '"')
+        self.run_command('SetFile -a V "' + os.path.join(volpath, "background.jpg") + '"')
+        self.run_command('SetFile -a V "' + os.path.join(volpath, ".DS_Store") + '"')
+
+        # Create the alias file (which is a resource file) from the .r
+        self.run_command('rez "' + self.src_path_of("installers/darwin/release-dmg/Applications-alias.r") + '" -o "' + os.path.join(volpath, "Applications") + '"')
+
+        # Set the alias file's alias and custom icon bits
+        self.run_command('SetFile -a AC "' + os.path.join(volpath, "Applications") + '"')
+
+        # Set the disk image root's custom icon bit
+        self.run_command('SetFile -a C "' + volpath + '"')
+
+        # Unmount the image
+        self.run_command('hdiutil detach -force "' + devfile + '"')
+
+        print "Converting temp disk image to final disk image"
+        self.run_command('hdiutil convert "%(sparse)s" -format UDZO -imagekey zlib-level=9 -o "%(final)s"' % {'sparse':sparsename, 'final':finalname})
+        # get rid of the temp file
+        self.package_file = finalname
+        self.remove(sparsename)
+
+class LinuxManifest(ViewerManifest):
+    def construct(self):
+        super(LinuxManifest, self).construct()
+
+        self.path("res/imprudence_icon.png","imprudence_icon.png")
+        if self.prefix("linux_tools", dst=""):
+            #self.path("client-readme.txt","README-linux.txt")
+            self.path("client-readme-voice.txt","README-linux-voice.txt")
+            #self.path("client-readme-joystick.txt","README-linux-joystick.txt")
+            self.path("wrapper.sh","imprudence")
+            self.path("handle_secondlifeprotocol.sh")
+            self.path("register_secondlifeprotocol.sh")
+            self.path("getvoice.sh")
+            self.end_prefix("linux_tools")
+
+        self.gather_documents()
+
+        # From the linden directory
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries.txt")
+            self.end_prefix("../..")
+
+        # Create an appropriate gridargs.dat for this package, denoting required grid.
+        self.put_in_file(self.flags_list(), 'gridargs.dat')
+        self.path("linux_tools/launch_url.sh","launch_url.sh")
+        self.path("../llplugin/slplugin/SLPlugin", "bin/SLPlugin")
+        if self.prefix("res-sdl"):
+            self.path("*")
+            # recurse
+            self.end_prefix("res-sdl")
+
+        # plugins
+        if self.prefix(src="", dst="bin/llplugin"):
+            self.path("../media_plugins/webkit/libmedia_plugin_webkit.so", "libmedia_plugin_webkit.so")
+            self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so")
+            self.end_prefix("bin/llplugin")
+
+        # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
+        self.path("skins/default/xui/en-us/mime_types_linux.xml", "skins/default/xui/en-us/mime_types.xml")
+
+        self.path("featuretable_linux.txt")
+
+
+    def package_finish(self):
+        if 'installer_name' in self.args:
+            installer_name = self.args['installer_name']
+        else:
+            installer_name_components = ['Imprudence_', self.args.get('arch')]
+            installer_name_components.extend(self.args['version'])
+            installer_name = "_".join(installer_name_components)
+            if self.default_channel():
+                if not self.default_grid():
+                    installer_name += '_' + self.args['grid'].upper()
+            else:
+                installer_name += '_' + self.channel_oneword().upper()
+
+        # Fix access permissions
+        self.run_command("""
+                find %(dst)s -type d | xargs --no-run-if-empty chmod 755;
+                find %(dst)s -type f -perm 0700 | xargs --no-run-if-empty chmod 0755;
+                find %(dst)s -type f -perm 0500 | xargs --no-run-if-empty chmod 0555;
+                find %(dst)s -type f -perm 0600 | xargs --no-run-if-empty chmod 0644;
+                find %(dst)s -type f -perm 0400 | xargs --no-run-if-empty chmod 0444;
+                true""" %  {'dst':self.get_dst_prefix() })
+
+        self.package_file = installer_name + '.tar.bz2'
+
+        # Disabled for now. It's a waste of time to package every compile.
+
+        # if("package" in self.args['actions'] or
+        #    "unpacked" in self.args['actions']):
+        #
+        #     # temporarily move directory tree so that it has the right
+        #     # name in the tarfile
+        #     self.run_command("mv %(dst)s %(inst)s" % {
+        #         'dst': self.get_dst_prefix(),
+        #         'inst': self.build_path_of(installer_name)})
+        #     try:
+        #         # --numeric-owner hides the username of the builder for
+        #         # security etc.
+        #         self.run_command('tar -C %(dir)s --numeric-owner -cjf '
+        #                          '%(inst_path)s.tar.bz2 %(inst_name)s' % {
+        #             'dir': self.get_build_prefix(),
+        #             'inst_name': installer_name,
+        #             'inst_path':self.build_path_of(installer_name)})
+        #     finally:
+        #         self.run_command("mv %(inst)s %(dst)s" % {
+        #             'dst': self.get_dst_prefix(),
+        #             'inst': self.build_path_of(installer_name)})
+
+class Linux_i686Manifest(LinuxManifest):
+    def construct(self):
+        super(Linux_i686Manifest, self).construct()
+        self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
+
+
+        if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
+            self.path("libapr-1.so.0")
+            self.path("libaprutil-1.so.0")
+            self.path("libdb-4.2.so")
+            self.path("libcrypto.so.0.9.7")
+            self.path("libexpat.so.1")
+            self.path("libssl.so.0.9.7")
+            self.path("libuuid.so", "libuuid.so.1")
+            self.path("libSDL-1.2.so.0")
+            self.path("libELFIO.so")
+            self.path("libopenjpeg.so.2")
+            self.path("libxml2.so.2")
+            self.path("libz.so.1")
+
+            # OpenAL
+            self.path("libopenal.so.1")
+            self.path("libalut.so.0")
+
+            # GTK+ and dependencies
+            self.path("libatk-1.0.so.0")
+            self.path("libcairo.so.2")
+            self.path("libfontconfig.so.1")
+            self.path("libfreetype.so.6")
+           # self.path("libgdk_pixbuf-2.0.so.0") # see linux64 why
+            self.path("libgdk-x11-2.0.so.0")
+            self.path("libgtk-x11-2.0.so.0")
+           # self.path("libpango-1.0.so.0")      # dto.
+           # self.path("libpangoft2-1.0.so.0")
+           # self.path("libpangox-1.0.so.0")
+           # self.path("libpangoxft-1.0.so.0")
+            self.path("libpixman-1.so.0")
+
+            # Gstreamer libs
+            self.path("libgstbase-0.10.so.0")
+            self.path("libgstreamer-0.10.so.0")
+            self.path("libgstaudio-0.10.so.0")
+            self.path("libgstbase-0.10.so.0")
+            self.path("libgstcontroller-0.10.so.0")
+            self.path("libgstdataprotocol-0.10.so.0")
+            self.path("libgstinterfaces-0.10.so.0")
+            self.path("libgstnetbuffer-0.10.so.0")
+            self.path("libgstpbutils-0.10.so.0")
+            self.path("libgstriff-0.10.so.0")
+            self.path("libgstrtp-0.10.so.0")
+            self.path("libgstrtsp-0.10.so.0")
+            self.path("libgstsdp-0.10.so.0")
+            self.path("libgsttag-0.10.so.0")
+            self.path("libgstvideo-0.10.so.0")
+
+            # Gstreamer plugin dependencies
+            self.path("libfaad.so.0")
+            self.path("libogg.so.0")
+            self.path("libtheora.so.0")
+            self.path("libvorbis.so.0")
+            self.path("libvorbisenc.so.2")
+            self.path("liboil-0.3.so.0")
+
+            # Gstreamer plugins
+            if self.prefix("gstreamer-plugins"):
+                self.path("libgstalsa.so")
+                self.path("libgstasf.so")
+                self.path("libgstaudioconvert.so")
+                self.path("libgstaudioresample.so")
+                self.path("libgstautodetect.so")
+                self.path("libgstavi.so")
+                self.path("libgstcoreelements.so")
+                self.path("libgstcoreindexers.so")
+                self.path("libgstdecodebin2.so")
+                self.path("libgstdecodebin.so")
+                self.path("libgstesd.so")
+                self.path("libgstfaad.so")
+                self.path("libgstffmpeg.so")
+                self.path("libgstgnomevfs.so")
+                self.path("libgsticydemux.so")
+                self.path("libgstid3demux.so")
+                self.path("libgstmpegdemux.so")
+                self.path("libgstmultifile.so")
+                self.path("libgstmultipart.so")
+                self.path("libgstogg.so")
+                self.path("libgstossaudio.so")
+                self.path("libgstplaybin.so")
+                self.path("libgstpulse.so")
+                self.path("libgstqtdemux.so")
+                self.path("libgstqueue2.so")
+                self.path("libgsttcp.so")
+                self.path("libgsttheora.so")
+                self.path("libgsttypefindfunctions.so")
+                self.path("libgstudp.so")
+                self.path("libgstvideoscale.so")
+                self.path("libgstvolume.so")
+                self.path("libgstvorbis.so")
+                self.path("libgstwavparse.so")
+                
+                self.end_prefix("gstreamer-plugins")
+            
+            self.end_prefix("lib")
+
+            # Vivox runtimes and libs
+            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
+                self.path("SLVoice")
+                self.end_prefix("bin")
+
+            if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
+                self.path("libalut.so")
+                self.path("libortp.so")
+                self.path("libvivoxsdk.so")
+                self.end_prefix("lib")
+
+class Linux_x86_64Manifest(LinuxManifest):
+    def construct(self):
+        super(Linux_x86_64Manifest, self).construct()
+        self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
+#        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
+
+        self.path("linux_tools/launch_url.sh","launch_url.sh")
+        if self.prefix("res-sdl"):
+            self.path("*")
+            # recurse
+            self.end_prefix("res-sdl")
+
+        self.path("featuretable_linux.txt")
+        #self.path("secondlife-x86_64.supp")
+
+        self.path("app_settings/mozilla-runtime-linux-x86_64")
+
+        if self.prefix("../../libraries/x86_64-linux/lib_release_client", dst="lib64"):
+            self.path("libapr-1.so.0")
+            self.path("libaprutil-1.so.0")
+            self.path("libdb-4.2.so")
+            self.path("libcrypto.so.0.9.8")
+            self.path("libexpat.so.1")
+            self.path("libssl.so.0.9.8")
+            self.path("libuuid.so", "libuuid.so.1")
+            self.path("libSDL-1.2.so.0")
+            self.path("libELFIO.so")
+            self.path("libjpeg.so.7")
+            self.path("libpng12.so.0")
+            self.path("libopenjpeg.so.2")
+            self.path("libxml2.so.2")
+            #self.path("libz.so.1") #not needed
+
+            # OpenAL
+            self.path("libopenal.so.1")
+            self.path("libalut.so.0")
+
+            # GTK+ and dependencies
+            self.path("libatk-1.0.so.0")
+            self.path("libcairo.so.2")
+            self.path("libfontconfig.so.1")
+            self.path("libfreetype.so.6")
+            self.path("libgdk_pixbuf-2.0.so.0") # was commented to use systems gdk pixbufs instead -
+                                                # but seems webkit needs it o_O . Packaging for testing now.
+            self.path("libgdk-x11-2.0.so.0")
+            self.path("libgtk-x11-2.0.so.0")
+#            self.path("libpango-1.0.so.0")             # use systems pango instead
+#            self.path("libpangoft2-1.0.so.0")          # Both gdk pixbufs and pango would load systems modules
+#            self.path("libpangox-1.0.so.0")            # and crash if not compatible or present. 
+#            self.path("libpangoxft-1.0.so.0")          # So we depend system gdk pixbufs and pango anyway.
+            self.path("libpixman-1.so.0")
+
+            # Gstreamer libs
+            self.path("libgstbase-0.10.so.0")
+            self.path("libgstreamer-0.10.so.0")
+            self.path("libgstaudio-0.10.so.0")
+            self.path("libgstbase-0.10.so.0")
+            self.path("libgstcontroller-0.10.so.0")
+            self.path("libgstdataprotocol-0.10.so.0")
+            self.path("libgstinterfaces-0.10.so.0")
+            self.path("libgstnetbuffer-0.10.so.0")
+            self.path("libgstpbutils-0.10.so.0")
+            self.path("libgstriff-0.10.so.0")
+            self.path("libgstrtp-0.10.so.0")
+            self.path("libgstrtsp-0.10.so.0")
+            self.path("libgstsdp-0.10.so.0")
+            self.path("libgsttag-0.10.so.0")
+            self.path("libgstvideo-0.10.so.0")
+
+            # Gstreamer plugin dependencies
+            self.path("libfaad.so.0")
+            self.path("libogg.so.0")
+            self.path("libtheora.so.0")
+            self.path("libvorbis.so.0")
+            self.path("libvorbisenc.so.2")
+            self.path("liboil-0.3.so.0")
+
+            # Gstreamer plugins
+            if self.prefix("gstreamer-plugins"):
+                self.path("libgstalsa.so")
+                self.path("libgstasf.so")
+                self.path("libgstaudioconvert.so")
+                self.path("libgstaudioresample.so")
+                self.path("libgstautodetect.so")
+                self.path("libgstavi.so")
+                self.path("libgstcoreelements.so")
+                self.path("libgstcoreindexers.so")
+                self.path("libgstdecodebin2.so")
+                self.path("libgstdecodebin.so")
+                self.path("libgstesd.so")
+                self.path("libgstfaad.so")
+                self.path("libgstffmpeg.so")
+                self.path("libgstffmpegcolorspace.so")
+                self.path("libgstgnomevfs.so")
+                self.path("libgsticydemux.so")
+                self.path("libgstid3demux.so")
+                self.path("libgstmpegdemux.so")
+                self.path("libgstmultifile.so")
+                self.path("libgstmultipart.so")
+                self.path("libgstogg.so")
+                self.path("libgstossaudio.so")
+                self.path("libgstplaybin.so")
+                self.path("libgstpulse.so")
+                self.path("libgstqtdemux.so")
+                self.path("libgstqueue2.so")
+                self.path("libgsttcp.so")
+                self.path("libgsttheora.so")
+                self.path("libgsttypefindfunctions.so")
+                self.path("libgstudp.so")
+                self.path("libgstvideoscale.so")
+                self.path("libgstvolume.so")
+                self.path("libgstvorbis.so")
+                self.path("libgstwavparse.so")
+                
+                self.end_prefix("gstreamer-plugins")
+            self.end_prefix("lib64")
+        
+
+            # Vivox runtimes and libs
+            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
+                self.path("SLVoice")
+                self.end_prefix("bin")
+
+            if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"):
+                #self.path("libalut.so")
+                self.path("libortp.so")
+                self.path("libvivoxsdk.so")
+                self.end_prefix("lib32")
+                
+            # 32bit libs needed for voice
+            if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
+                self.path("libalut.so")
+                self.path("libidn.so.11")
+                self.path("libopenal.so.1")
+                # self.path("libortp.so")
+                self.path("libuuid.so.1")
+            self.end_prefix("lib32")
+
+if __name__ == "__main__":
+    main()