Henri Beauchamps version of Sione Lomus media filter patch.

from http://sldev.free.fr/ : "MediaFilter_v3: based on code by Sione Lomu with a couple of bugfixes by Tonya Souther, this improved patch brings media and streaming audio URLs filtering (to prevent IP ripping by so-called security systems which violate the SL TOS by catching your IP and associating your various avatars with it, thus violating your anonimity). Beside empowering your viewer with allow/deny/blacklist/whitelist functions per domain, this improved patch makes the difference between external servers (domains names filtering) and in-world servers (scripted objects with built-in HTTP servers). I also fixed various bugs, security holes and shortcomings, refactored the code and improved it, and added a whitelist/blacklist erasing function."

Imprudence changes: added "MediaFilter" debug to be able to inspect the full url and media texture uuid

1 files changed, 20 insertions, 1 deletions

diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 4e1d03e..93b73c7 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -383,6 +383,23 @@ void LLOverlayBar::onClickStandUp(void*)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+void LLOverlayBar::audioFilterPlay()
+{
+        if (gOverlayBar && gOverlayBar->mMusicState != PLAYING)
+        {
+                gOverlayBar->mMusicState = PLAYING;
+        }
+}
+
+void LLOverlayBar::audioFilterStop()
+{
+        if (gOverlayBar && gOverlayBar->mMusicState != STOPPED)
+        {
+                gOverlayBar->mMusicState = STOPPED;
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // static media helpers
 // *TODO: Move this into an audio manager abstraction
 //static
@@ -416,6 +433,7 @@ void LLOverlayBar::toggleMediaPlay(void*)
                 LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                 if (parcel)
                 {
+                        LLViewerParcelMedia::sIsUserAction = true;
                         LLViewerParcelMedia::play(parcel);
                 }
         }
@@ -447,7 +465,8 @@ void LLOverlayBar::toggleMusicPlay(void*)
                                 // stream is stopped, it doesn't return the right thing - commenting out for now.
         //                      if ( gAudioStream->isInternetStreamPlaying() == 0 )
                                 {
-                                        gAudioStream->startInternetStream(parcel->getMusicURL());
+                                        LLViewerParcelMedia::sIsUserAction = true;
+                                        LLViewerParcelMedia::playStreamingMusic(parcel);
                                 }
                         }
                 }