Merge remote branch 'armin/weekly' into weekly

5 files changed, 31 insertions, 3 deletions

diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 8018c31..7c8ddf1 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -466,7 +466,9 @@ void LLFloaterDirectory::setVisible(BOOL visible)
 
 void LLFloaterDirectory::onClose(bool app_quitting)
 {
-        setVisible(FALSE);
+        LLFloater::onClose(app_quitting);
+
+        //setVisible(FALSE); //meaning you hide 3 web browsers - one SLPlugin each
 }
 
 // static
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index e47ae2a..6110e44 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -416,6 +416,7 @@ BOOL LLPanelAvatarWeb::postBuild(void)
         childSetControlName("auto_load","AutoLoadWebProfiles");
 
         mWebBrowser = getChild<LLMediaCtrl>("profile_html");
+
         mWebBrowser->addObserver(this);
 
         // links open in internally 
@@ -490,7 +491,17 @@ void LLPanelAvatarWeb::refresh()
                 mNavigateTo = "";
         }
 }
+void LLPanelAvatarWeb::onVisibilityChange(BOOL new_visibility)
+{
+        LLPluginClassMedia::EPriority new_priority;
 
+        if (new_visibility)
+                new_priority = LLPluginClassMedia::PRIORITY_NORMAL;
+        else
+                new_priority = LLPluginClassMedia::PRIORITY_HIDDEN;
+
+        mWebBrowser->getMediaPlugin()->setPriority(new_priority);
+}
 
 void LLPanelAvatarWeb::enableControls(BOOL self)
 {       
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index b687cd8..9a2f450 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -76,7 +76,6 @@ public:
         /*virtual*/ void draw();
 
         LLPanelAvatar* getPanelAvatar() const { return mPanelAvatar; }
-
         void setDataRequested(bool requested) { mDataRequested = requested; }
         bool isDataRequested() const              { return mDataRequested; }
 
@@ -143,14 +142,15 @@ public:
         LLPanelAvatarWeb(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
         /*virtual*/ ~LLPanelAvatarWeb();
         /*virtual*/ BOOL        postBuild(void);
-
         /*virtual*/ void refresh();
+        /*virtual*/ void onVisibilityChange(BOOL new_visibility);
 
         void enableControls(BOOL own_avatar);
 
         void setWebURL(std::string url);
 
         void load(std::string url);
+
         static void onURLKeystroke(LLLineEditor* editor, void* data);
         static void onCommitLoad(LLUICtrl* ctrl, void* data);
         static void onCommitURL(LLUICtrl* ctrl, void* data);
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 342ffec..719a7a0 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -62,6 +62,7 @@
 #include "lluictrlfactory.h"
 #include "llfloaterdirectory.h"
 #include "llpaneldirbrowser.h"
+#include "llpluginclassmedia.h"
 
 #include <boost/tokenizer.hpp>
 #if LL_WINDOWS
@@ -196,10 +197,17 @@ void LLPanelDirFind::draw()
 // virtual
 void LLPanelDirFind::onVisibilityChange(BOOL new_visibility)
 {
+        LLPluginClassMedia::EPriority new_priority;
         if (new_visibility)
         {
                 mFloaterDirectory->hideAllDetailPanels();
+                new_priority = LLPluginClassMedia::PRIORITY_NORMAL;
         }
+        else
+                new_priority = LLPluginClassMedia::PRIORITY_HIDDEN;
+
+        mWebBrowser->getMediaPlugin()->setPriority(new_priority);
+
         LLPanel::onVisibilityChange(new_visibility);
 }
 
diff --git a/linden/install.xml b/linden/install.xml
index e8c8b54..7fda398 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1343,6 +1343,13 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>30cb00069fe2a545fbf7be1070386236</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>quicktime</key>