diff options
author | Armin Weatherwax | 2011-03-13 15:19:55 +0100 |
---|---|---|
committer | Armin Weatherwax | 2011-03-13 15:19:55 +0100 |
commit | b543f291fcf945330fd5a533cc7235c20d7cb4c5 (patch) | |
tree | 46e725a9a11f6d54535f869d0a2494efaeb6985c /linden/indra/newview/llviewermenu.cpp | |
parent | fix voice doesn't kick in. (diff) | |
download | meta-impy-b543f291fcf945330fd5a533cc7235c20d7cb4c5.zip meta-impy-b543f291fcf945330fd5a533cc7235c20d7cb4c5.tar.gz meta-impy-b543f291fcf945330fd5a533cc7235c20d7cb4c5.tar.bz2 meta-impy-b543f291fcf945330fd5a533cc7235c20d7cb4c5.tar.xz |
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
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index cf3cec1..a22f704 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -234,6 +234,7 @@ | |||
234 | #include "hippolimits.h" | 234 | #include "hippolimits.h" |
235 | 235 | ||
236 | #include "llfloaterteleporthistory.h" | 236 | #include "llfloaterteleporthistory.h" |
237 | #include "slfloatermediafilter.h" | ||
237 | 238 | ||
238 | using namespace LLVOAvatarDefines; | 239 | using namespace LLVOAvatarDefines; |
239 | void init_client_menu(LLMenuGL* menu); | 240 | void init_client_menu(LLMenuGL* menu); |
@@ -5996,6 +5997,10 @@ class LLShowFloater : public view_listener_t | |||
5996 | { | 5997 | { |
5997 | LLFloaterMute::toggleInstance(); | 5998 | LLFloaterMute::toggleInstance(); |
5998 | } | 5999 | } |
6000 | else if (floater_name == "media filter") | ||
6001 | { | ||
6002 | SLFloaterMediaFilter::toggleInstance(); | ||
6003 | } | ||
5999 | else if (floater_name == "camera controls") | 6004 | else if (floater_name == "camera controls") |
6000 | { | 6005 | { |
6001 | LLFloaterCamera::toggleInstance(); | 6006 | LLFloaterCamera::toggleInstance(); |
@@ -6161,6 +6166,10 @@ class LLFloaterVisible : public view_listener_t | |||
6161 | { | 6166 | { |
6162 | new_value = LLFloaterMute::instanceVisible(); | 6167 | new_value = LLFloaterMute::instanceVisible(); |
6163 | } | 6168 | } |
6169 | else if (floater_name == "media filter") | ||
6170 | { | ||
6171 | new_value = SLFloaterMediaFilter::instanceVisible(); | ||
6172 | } | ||
6164 | else if (floater_name == "camera controls") | 6173 | else if (floater_name == "camera controls") |
6165 | { | 6174 | { |
6166 | new_value = LLFloaterCamera::instanceVisible(); | 6175 | new_value = LLFloaterCamera::instanceVisible(); |