1 files changed, 64 insertions, 16 deletions

diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 257ce0d..5326049 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"
@@ -1605,6 +1605,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)
@@ -1732,21 +1735,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)
 {
@@ -1943,6 +1931,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()
 {