From e2c84771ca57722751d6cd9e77bd99f5317d5ea9 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sat, 26 Mar 2011 12:50:47 +0200
Subject: Fix #810: Add video/x-m4v to mime_types_*.xml

---
 .../newview/skins/default/xui/en-us/mime_types_linux.xml  | 11 +++++++++++
 .../newview/skins/default/xui/en-us/mime_types_mac.xml    | 11 +++++++++++
 .../skins/default/xui/en-us/mime_types_windows.xml        | 15 +++++++++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)

(limited to 'linden')

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
index e95b371..f0ba830 100755
--- 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
@@ -431,6 +431,17 @@
 			media_plugin_gstreamer
 		</impl>
 	</mimetype>
+	<mimetype name="video/x-m4v">
+		<label name="video/m4v_label">
+			Movie (M4V)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
 		<label name="video/quicktime_label">
 			Movie (QuickTime)
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
index 7931e55..e1751eb 100755
--- 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
@@ -431,6 +431,17 @@
 			media_plugin_quicktime
 		</impl>
 	</mimetype>
+	<mimetype name="video/x-m4v">
+		<label name="video/m4v_label">
+			Movie (M4V)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
 		<label name="video/quicktime_label">
 			Movie (QuickTime)
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
index 5ee4ed0..26491e0 100644
--- 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
@@ -428,8 +428,19 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
-    </impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="video/x-m4v">
+		<label name="video/m4v_label">
+			Movie (M4V)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
 		<label name="video/quicktime_label">
-- 
cgit v1.1


From d43621f92f8ed54bf3004f5ebff39288ed01f395 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sun, 27 Mar 2011 12:45:03 +0200
Subject: Fix #811: Map tiles are deformed when NOT on Aurora.

Caused by uninitialized members.
---
 linden/indra/newview/llworldmap.cpp     | 4 +++-
 linden/indra/newview/llworldmapview.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index bd3996d..608d720 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -81,7 +81,9 @@ LLSimInfo::LLSimInfo()
 	mAccess(0x0),
 	mRegionFlags(0x0),
 	mWaterHeight(0.f),
-	mAlpha(-1.f)
+	mAlpha(-1.f),
+	msizeX(REGION_WIDTH_UNITS),
+	msizeY(REGION_WIDTH_UNITS)
 {
 }
 
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 8d9ed1b..d7a6838 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -472,7 +472,7 @@ void LLWorldMapView::draw()
 		F32 bottom =	sPanY + half_height + relative_y;
 		F32 left =		sPanX + half_width + relative_x;
 		F32 top =		bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS);
-		F32 right =		left + (sMapScale * info->msizeY / REGION_WIDTH_METERS);
+		F32 right =		left + (sMapScale * info->msizeX / REGION_WIDTH_METERS);
 
 		// Switch to world map texture (if available for this region) if either:
 		// 1. Tiles are zoomed out small enough, or
-- 
cgit v1.1


From f6347b941b08a620d82ba5a11254362f392a439e Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Mon, 28 Mar 2011 20:11:12 +0200
Subject: Sync media filter patch to Henri Beauchamp's MediaFilter_v4

Compared to v3, this adds resolving domains to IPs in order to list
them and match them against listed IPs. Also shows both the full stream
url and the munged domain that will be added to the lists.
---
 linden/indra/newview/llviewerparcelmedia.cpp       | 108 +++++++++++++-----
 .../default/xui/en-us/floater_media_filter.xml     |  39 +++++--
 .../skins/default/xui/en-us/notifications.xml      |   8 +-
 linden/indra/newview/slfloatermediafilter.cpp      | 124 ++++++++++++++++++++-
 linden/indra/newview/slfloatermediafilter.h        |   2 +
 5 files changed, 239 insertions(+), 42 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index a5d97f2..b816ab4 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -649,13 +649,18 @@ bool LLViewerParcelMedia::allowedMedia(std::string media_url)
 {
 	LLStringUtil::trim(media_url);
 	std::string domain = extractDomain(media_url);
+	LLHost host;
+	host.setHostByName(domain);
+	std::string ip = host.getIPString();
 	if (sAllowedMedia.count(domain))
 	{
 		return true;
 	}
+	std::string server;
 	for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
 	{
-		if (sMediaFilterList[i]["domain"].asString() == domain)
+		server = sMediaFilterList[i]["domain"].asString();
+		if (server == domain || server == ip)
 		{
 			if (sMediaFilterList[i]["action"].asString() == "allow")
 			{
@@ -675,6 +680,7 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
 	std::string media_action;
 	std::string media_url;
 	std::string domain;
+	std::string ip;
 
 	if (parcel != LLViewerParcelMgr::getInstance()->getAgentParcel())
 	{
@@ -703,31 +709,51 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
 		return;
 	}
 
+	LLHost host;
+	host.setHostByName(domain);
+	ip = host.getIPString();
+
 	if (sIsUserAction)
 	{
 		// This was a user manual request to play this media, so give
 		// it another chance...
 		sIsUserAction = false;
+		bool dirty = false;
 		if (sDeniedMedia.count(domain))
 		{
 			sDeniedMedia.erase(domain);
+			dirty = true;
+		}
+		if (sDeniedMedia.count(ip))
+		{
+			sDeniedMedia.erase(ip);
+			dirty = true;
+		}
+		if (dirty)
+		{
 			SLFloaterMediaFilter::setDirty();
 		}
 	}
 
-	if (!sMediaFilterListLoaded || sDeniedMedia.count(domain))
+	if (media_url.empty())
+	{
+		media_action == "allow";
+	}
+	else if (!sMediaFilterListLoaded || sDeniedMedia.count(domain) || sDeniedMedia.count(ip))
 	{
 		media_action = "ignore";
 	}
-	else if (sAllowedMedia.count(domain))
+	else if (sAllowedMedia.count(domain) || sAllowedMedia.count(ip))
 	{
 		media_action = "allow";
 	}
 	else
 	{
+		std::string server;
 		for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
 		{
-			if (sMediaFilterList[i]["domain"].asString() == domain)
+			server = sMediaFilterList[i]["domain"].asString();
+			if (server == domain || server == ip)
 			{
 				media_action = sMediaFilterList[i]["action"].asString();
 				break;
@@ -735,7 +761,7 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
 		}
 	}
 
-	if (media_action == "allow" || media_url.empty())
+	if (media_action == "allow")
 	{
 		if (type == 0)
 		{
@@ -745,47 +771,51 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
 		{
 			playStreamingMusic(parcel, false);
 		}
+		return;
 	}
-	else if (media_action == "deny")
+	if (media_action == "ignore")
 	{
-		LLSD args;
-		args["DOMAIN"] = domain;
-		LLNotifications::instance().add("MediaBlocked", args);
 		if (type == 1)
 		{
 			LLViewerParcelMedia::stopStreamingMusic();
 		}
-		// So to avoid other "blocked" messages later in the session
-		// for this url should it be requested again by a script.
-		sDeniedMedia.insert(domain);
+		return;
+	}
+
+	LLSD args;
+	if (ip != domain && domain.find('/') == std::string::npos)
+	{
+		args["DOMAIN"] = domain + " (" + ip + ")";
 	}
-	else if (media_action == "ignore")
+	else
+	{
+		args["DOMAIN"] = domain;
+	}
+
+	if (media_action == "deny")
 	{
+		LLNotifications::instance().add("MediaBlocked", args);
 		if (type == 1)
 		{
 			LLViewerParcelMedia::stopStreamingMusic();
 		}
+		// So to avoid other "blocked" messages later in the session
+		// for this url should it be requested again by a script.
+		// We don't add the IP, on purpose (want to show different
+		// blocks for different domains pointing to the same IP).
+		sDeniedMedia.insert(domain);
 	}
 	else
 	{
 		sMediaQueries.insert(domain);
-		LLSD args;
-		args["DOMAIN"] = domain;
-		if (media_url.find('?') != std::string::npos)
-		{
-			args["WARNING"] = " (WARNING: this URL also contains parameter(s) that could potentially be used to correlate your avatar name with your IP)";
-		}
-		else
-		{
-			args["WARNING"] = "";
-		}
+		args["URL"] = media_url;
 		if (type == 0)
 		{
-			args["TYPE"] = "a media";
+			args["TYPE"] = "media";
 		}
 		else
 		{
-			args["TYPE"] = "an audio";
+			args["TYPE"] = "audio";
 		}
 		LLNotifications::instance().add("MediaAlert", args, LLSD(), boost::bind(callback_media_alert, _1, _2, parcel, type, domain));
 	}
@@ -795,8 +825,19 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
 
+	LLHost host;
+	host.setHostByName(domain);
+	std::string ip = host.getIPString();
+
 	LLSD args;
-	args["DOMAIN"] = domain;
+	if (ip != domain && domain.find('/') == std::string::npos)
+	{
+		args["DOMAIN"] = domain + " (" + ip + ")";
+	}
+	else
+	{
+		args["DOMAIN"] = domain;
+	}
 
 	if (option == 0 || option == 3) // Allow or Whitelist
 	{
@@ -807,6 +848,11 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
 			newmedia["domain"] = domain;
 			newmedia["action"] = "allow";
 			LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+			if (ip != domain && domain.find('/') == std::string::npos)
+			{
+				newmedia["domain"] = ip;
+				LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+			}
 			LLViewerParcelMedia::saveDomainFilterList();
 			args["LISTED"] = "whitelisted";
 			LLNotifications::instance().add("MediaListed", args);
@@ -823,6 +869,10 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
 	else if (option == 1 || option == 2) // Deny or Blacklist
 	{
 		LLViewerParcelMedia::sDeniedMedia.insert(domain);
+		if (ip != domain && domain.find('/') == std::string::npos)
+		{
+			LLViewerParcelMedia::sDeniedMedia.insert(ip);
+		}
 		if (type == 1)
 		{
 			LLViewerParcelMedia::stopStreamingMusic();
@@ -837,6 +887,11 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
 			newmedia["domain"] = domain;
 			newmedia["action"] = "deny";
 			LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+			if (ip != domain && domain.find('/') == std::string::npos)
+			{
+				newmedia["domain"] = ip;
+				LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+			}
 			LLViewerParcelMedia::saveDomainFilterList();
 			args["LISTED"] = "blacklisted";
 			LLNotifications::instance().add("MediaListed", args);
@@ -975,3 +1030,4 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
 
 	return url;
 }
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
index 9b7355c..5faaf1a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -15,47 +15,64 @@
 	 background_visible="true" mouse_opaque="true"
 	 multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
 	 bottom_delta="-205" left="15" height="200" width="280">
-		<column name="whitelist_col" label="Allowed domains/objects" dynamicwidth="true" />
+		<column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
 	</scroll_list>
 
 	<scroll_list name="blacklist_list" follows="top|bottom|right"
 	 background_visible="true" mouse_opaque="true"
 	 multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
 	 bottom_delta="0" right="-15" height="200" width="280">
-		<column name="blacklist_col" label="Blocked domains/objects" dynamicwidth="true" />
+		<column name="blacklist_col" label="Blocked domains or server objects" dynamicwidth="true" />
 	</scroll_list>
 
 	<button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
+	 tool_tip="Add a server to the whitelist"
 	 enabled="true" mouse_opaque="true" follows="bottom|left"
-	 bottom_delta="-25" left="30" height="20" width="80" />
+	 bottom_delta="-25" left="15" height="20" width="80" />
 
 	<button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
+	 tool_tip="Remove the selected server from the whitelist"
 	 enabled="true" mouse_opaque="true" follows="bottom|left"
-	 bottom_delta="0" left_delta="100" height="20" width="80" />
+	 bottom_delta="0" left="100" height="20" width="80" />
 
 	<button name="clear_lists" font="SansSerif" label="Clear lists" halign="center"
-	 enabled="true" mouse_opaque="true" follows="bottom|left|right"
-	 bottom_delta="0" left_delta="110" height="20" width="120" />
+	 tool_tip="Clear all lists"
+	 enabled="true" mouse_opaque="true" follows="bottom|left"
+	 bottom_delta="0" left="205" height="20" width="90" />
+
+	<button name="show_ips" font="SansSerif" label="Show IPs" halign="center"
+	 tool_tip="Show the IP associated with each domain name (makes the viewer pause while the list is refreshed, because of DNS lookups)"
+	 enabled="true" mouse_opaque="true" follows="bottom|right"
+	 bottom_delta="0" right="-205" height="20" width="90" />
 
 	<button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
+	 tool_tip="Add a server to the blacklist"
 	 enabled="true" mouse_opaque="true" follows="bottom|right"
-	 bottom_delta="0" right="-130" height="20" width="80" />
+	 bottom_delta="0" right="-100" height="20" width="80" />
 
 	<button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
+	 tool_tip="Remove the selected server from the blacklist"
 	 enabled="true" mouse_opaque="true" follows="bottom|right"
-	 bottom_delta="0" right="-30" height="20" width="80" />
+	 bottom_delta="0" right="-15" height="20" width="80" />
 
-	<text name="add_text" font="SansSerif" mouse_opaque="true" enabled="true"
-	 bottom_delta="-25" left="20" height="20" width="500" follows="left|right|bottom">
+	<text name="add_text" font="SansSerif" mouse_opaque="true"
+	 bottom_delta="-25" left="20" height="20" width="450" follows="left|right|bottom">
 		New domain:
 	</text>
 
+	<check_box name="match_ip" label="Add/remove matching IP" initial_value="true"
+	 tool_tip="Add or remove any IP associated with the added or removed domain name"
+	 font="SansSerifSmall" mouse_opaque="true" radio_style="false"
+	 bottom_delta="2" right="-95" height="16" width="70" follows="right|bottom" />
+
 	<line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
+	 tool_tip="Enter the new URL, domain name, IP or scripted object HTTP server path here"
 	 select_all_on_focus_received="true" select_on_focus="true"
 	 bevel_style="in" border_style="line" border_thickness="1"
-	 bottom_delta="-20"	right="-100" height="20" left="15" follows="left|bottom|right"/>
+	 bottom_delta="-22"	right="-100" height="20" left="15" follows="left|bottom|right"/>
 
 	<button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
+	 tool_tip="Add to the list"
 	 mouse_opaque="true" follows="bottom|right"
 	 bottom_delta="0" right="-15" height="20" width="80"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 27f5529..aa4a1b5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7324,11 +7324,15 @@ The Second Life Terms of Service do not allow you to opt out. By logging in to S
    icon="alert.tga"
    name="MediaAlert"
    type="alert">
-The owner of this parcel has requested [TYPE] URL pertaining to the following domain or scripted object to be loaded by your viewer[WARNING]:
+The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
+
+[URL]
+
+You may choose to allow or deny the corresponding domain or in-world scripted object server:
 
 [DOMAIN]
 
-"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever to the above domain or scripted object.
+"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
    <form name="form">
     <button
 	 index="0"
diff --git a/linden/indra/newview/slfloatermediafilter.cpp b/linden/indra/newview/slfloatermediafilter.cpp
index c47ed26..7b287e0 100644
--- a/linden/indra/newview/slfloatermediafilter.cpp
+++ b/linden/indra/newview/slfloatermediafilter.cpp
@@ -43,6 +43,7 @@
 
 SLFloaterMediaFilter* SLFloaterMediaFilter::sInstance = NULL;
 bool SLFloaterMediaFilter::sIsWhitelist = false;
+bool SLFloaterMediaFilter::sShowIPs = false;
 
 SLFloaterMediaFilter::SLFloaterMediaFilter() : LLFloater(std::string("media filter")), mIsDirty(false)
 {
@@ -62,6 +63,7 @@ BOOL SLFloaterMediaFilter::postBuild()
 	if (mWhitelistSLC && mBlacklistSLC)
 	{
 		childSetAction("clear_lists", onClearLists, this);
+		childSetAction("show_ips", onShowIPs, this);
 		childSetAction("add_whitelist", onWhitelistAdd, this);
 		childSetAction("remove_whitelist", onWhitelistRemove, this);
 		childSetAction("add_blacklist", onBlacklistAdd, this);
@@ -84,6 +86,8 @@ void SLFloaterMediaFilter::draw()
 		mWhitelistSLC->deleteAllItems();
 		mBlacklistSLC->deleteAllItems();
 		std::set<std::string> listed;
+		LLHost host;
+		std::string ip;
 		std::string domain;
 		std::string action;
 		LLSD element;
@@ -92,6 +96,16 @@ void SLFloaterMediaFilter::draw()
 		for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
 		{
 			domain = LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString();
+			if (sShowIPs)
+			{
+				host.setHostByName(domain);
+				ip = host.getIPString();
+				if (ip != domain && domain.find('/') == std::string::npos)
+				{
+					domain += " (" + ip + ")";
+				}
+			}
+
 			action = LLViewerParcelMedia::sMediaFilterList[i]["action"].asString();
 			if (!domain.empty() && action == "allow")
 			{	
@@ -123,6 +137,15 @@ void SLFloaterMediaFilter::draw()
 		for (it = LLViewerParcelMedia::sAllowedMedia.begin(); it != LLViewerParcelMedia::sAllowedMedia.end(); it++)
 		{
 			domain = *it;
+			if (sShowIPs)
+			{
+				host.setHostByName(domain);
+				ip = host.getIPString();
+				if (ip != domain && domain.find('/') == std::string::npos)
+				{
+					domain += " (" + ip + ")";
+				}
+			}
 			if (listed.count(domain) == 0)
 			{
 				element["columns"][0]["value"] = domain;
@@ -133,6 +156,15 @@ void SLFloaterMediaFilter::draw()
 		for (it = LLViewerParcelMedia::sDeniedMedia.begin(); it != LLViewerParcelMedia::sDeniedMedia.end(); it++)
 		{
 			domain = *it;
+			if (sShowIPs)
+			{
+				host.setHostByName(domain);
+				ip = host.getIPString();
+				if (ip != domain && domain.find('/') == std::string::npos)
+				{
+					domain += " (" + ip + ")";
+				}
+			}
 			if (listed.count(domain) == 0)
 			{
 				element["columns"][0]["value"] = domain;
@@ -145,18 +177,21 @@ void SLFloaterMediaFilter::draw()
 		if (!gSavedSettings.getBOOL("MediaEnableFilter"))
 		{
 			childDisable("clear_lists");
+			childDisable("show_ips");
 			childDisable("blacklist_list");
 			childDisable("whitelist_list");
 			childDisable("remove_whitelist");
 			childDisable("add_whitelist");
 			childDisable("remove_blacklist");
 			childDisable("add_blacklist");
+			childDisable("match_ip");
 			childDisable("input_domain");
 			childDisable("commit_domain");
 			childSetText("add_text", std::string("****** WARNING: media filtering is currently DISABLED ******"));
 		}
 
 		mIsDirty = false;
+		sShowIPs = false;
 	}
 
 	LLFloater::draw();
@@ -208,6 +243,12 @@ void SLFloaterMediaFilter::onClearLists(void* data)
 	LLViewerParcelMedia::clearDomainFilterList();
 }
 
+void SLFloaterMediaFilter::onShowIPs(void* data)
+{
+	sShowIPs = true;
+	setDirty();
+}
+
 void SLFloaterMediaFilter::onWhitelistAdd(void* data)
 {
     if (!sInstance)
@@ -215,6 +256,7 @@ void SLFloaterMediaFilter::onWhitelistAdd(void* data)
 		return;
 	}
 	sInstance->childDisable("clear_lists");
+	sInstance->childDisable("show_ips");
 	sInstance->childDisable("blacklist_list");
 	sInstance->childDisable("whitelist_list");
 	sInstance->childDisable("remove_whitelist");
@@ -238,6 +280,12 @@ void SLFloaterMediaFilter::onWhitelistRemove(void* data)
 	if (selected)
 	{
 		std::string domain = sInstance->mWhitelistSLC->getSelectedItemLabel();
+		size_t pos = domain.find(' ');
+		if (pos != std::string::npos)
+		{
+			domain = domain.substr(0, pos);
+		}
+
 		LLViewerParcelMedia::sAllowedMedia.erase(domain);
 
 		for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
@@ -245,11 +293,32 @@ void SLFloaterMediaFilter::onWhitelistRemove(void* data)
 			if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
 			{
 				LLViewerParcelMedia::sMediaFilterList.erase(i);
-				LLViewerParcelMedia::saveDomainFilterList();
 				break;
 			}
 		}
 
+		if (sInstance->childGetValue("match_ip") && domain.find('/') == std::string::npos)
+		{
+			LLHost host;
+			host.setHostByName(domain);
+			std::string ip = host.getIPString();
+
+			if (ip != domain)
+			{
+				LLViewerParcelMedia::sAllowedMedia.erase(ip);
+
+				for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+				{
+					if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+					{
+						LLViewerParcelMedia::sMediaFilterList.erase(i);
+						break;
+					}
+				}
+			}
+		}
+
+		LLViewerParcelMedia::saveDomainFilterList();
 		setDirty();
 	}
 }
@@ -261,6 +330,7 @@ void SLFloaterMediaFilter::onBlacklistAdd(void* data)
 		return;
 	}
 	sInstance->childDisable("clear_lists");
+	sInstance->childDisable("show_ips");
 	sInstance->childDisable("blacklist_list");
 	sInstance->childDisable("whitelist_list");
 	sInstance->childDisable("remove_whitelist");
@@ -284,6 +354,12 @@ void SLFloaterMediaFilter::onBlacklistRemove(void* data)
 	if (selected)
 	{
 		std::string domain = sInstance->mBlacklistSLC->getSelectedItemLabel();
+		size_t pos = domain.find(' ');
+		if (pos != std::string::npos)
+		{
+			domain = domain.substr(0, pos);
+		}
+
 		LLViewerParcelMedia::sDeniedMedia.erase(domain);
 
 		for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
@@ -291,11 +367,32 @@ void SLFloaterMediaFilter::onBlacklistRemove(void* data)
 			if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
 			{
 				LLViewerParcelMedia::sMediaFilterList.erase(i);
-				LLViewerParcelMedia::saveDomainFilterList();
 				break;
 			}
 		}
 
+		if (sInstance->childGetValue("match_ip") && domain.find('/') == std::string::npos)
+		{
+			LLHost host;
+			host.setHostByName(domain);
+			std::string ip = host.getIPString();
+
+			if (ip != domain)
+			{
+				LLViewerParcelMedia::sDeniedMedia.erase(ip);
+
+				for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+				{
+					if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+					{
+						LLViewerParcelMedia::sMediaFilterList.erase(i);
+						break;
+					}
+				}
+			}
+		}
+
+		LLViewerParcelMedia::saveDomainFilterList();
 		setDirty();
 	}
 }	
@@ -308,6 +405,10 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
 	}
 	std::string domain = sInstance->childGetText("input_domain");
 	domain = LLViewerParcelMedia::extractDomain(domain);
+	LLHost host;
+	host.setHostByName(domain);
+	std::string ip = host.getIPString();
+	bool match_ip = (sInstance->childGetValue("match_ip") && ip != domain && domain.find('/') == std::string::npos);
 
 	if (!domain.empty())
 	{
@@ -318,7 +419,18 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
 			if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
 			{
 				LLViewerParcelMedia::sMediaFilterList.erase(i);
-				break;
+			}
+		}
+		if (match_ip)
+		{
+			LLViewerParcelMedia::sDeniedMedia.erase(ip);
+			LLViewerParcelMedia::sAllowedMedia.erase(ip);
+			for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+			{
+				if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == ip)
+				{
+					LLViewerParcelMedia::sMediaFilterList.erase(i);
+				}
 			}
 		}
 		LLSD newmedia;
@@ -332,10 +444,16 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
 			newmedia["action"] = "deny";
 		}
 		LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+		if (match_ip)
+		{
+			newmedia["domain"] = ip;
+			LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+		}
 		LLViewerParcelMedia::saveDomainFilterList();
 	}
 
 	sInstance->childEnable("clear_lists");
+	sInstance->childEnable("show_ips");
 	sInstance->childEnable("blacklist_list");
 	sInstance->childEnable("whitelist_list");
 	sInstance->childEnable("remove_whitelist");
diff --git a/linden/indra/newview/slfloatermediafilter.h b/linden/indra/newview/slfloatermediafilter.h
index 0f900be..aafa5a2 100644
--- a/linden/indra/newview/slfloatermediafilter.h
+++ b/linden/indra/newview/slfloatermediafilter.h
@@ -52,6 +52,7 @@ public:
 	static void toggleInstance();
 
 	static void onClearLists(void*);
+	static void onShowIPs(void*);
 	static void onWhitelistAdd(void*);
 	static void onWhitelistRemove(void*);
 	static void onBlacklistAdd(void*);
@@ -60,6 +61,7 @@ public:
 
 private:
 	static bool sIsWhitelist;
+	static bool sShowIPs;
 	LLScrollListCtrl* mWhitelistSLC;
 	LLScrollListCtrl* mBlacklistSLC;
 	bool mIsDirty;
-- 
cgit v1.1


From 690f97c62354f15f906834350286519be5637fdb Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Mon, 28 Mar 2011 22:30:30 +0200
Subject: Fix #832: Media Filter: handle sim hosts with no dns name.

This prevents streams from being erronously identified as originating
from a scripted object on the current sim, when the sim host doesn't
have a name that can be reverese resolved.
---
 linden/indra/newview/llviewerparcelmedia.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index b816ab4..01e86e2 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -983,7 +983,12 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
 		url = url.substr(pos + 1, count);
 	}
 
-	if (url.find(gAgent.getRegion()->getHost().getHostName()) == 0 || url.find(last_region) == 0)
+	std::string current_region = gAgent.getRegion()->getHost().getHostName();
+	if (!current_region.size())
+	{
+		current_region = gAgent.getRegion()->getHost().getIPString();
+	}
+	if (url.find(current_region) == 0 || url.find(last_region) == 0)
 	{
 		// This must be a scripted object rezzed in the region:
 		// extend the concept of "domain" to encompass the
@@ -992,7 +997,7 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
 
 		// Get rid of any port number
 		pos = url.find('/');		// We earlier made sure that there's one
-		url = gAgent.getRegion()->getHost().getHostName() + url.substr(pos);
+		url = current_region + url.substr(pos);
 
 		pos = url.find('?');
 		if (pos != std::string::npos)
@@ -1027,6 +1032,10 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
 	// Remember this region, so to cope with requests occuring just after a
 	// TP out of it.
 	last_region = gAgent.getRegion()->getHost().getHostName();
+	if (!last_region.size())
+	{
+		last_region = gAgent.getRegion()->getHost().getIPString();
+	}
 
 	return url;
 }
-- 
cgit v1.1


From 4131069d0f517180a92e8ebda20b4760ecaeb855 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Fri, 1 Apr 2011 15:28:48 +0300
Subject: Fix 829: Several changes to media filter

- Adds a "less annoying" mode, which attempts to only filter scripted
  streaming events. On by default (should we change that?)
- Adds UI to enable and disable the media filter, both from the filter
  floater and from the preferences floater.
- Adds a button to launch the filter floater to prefences.
- Some UI tweaks to the filter floater.
---
 linden/indra/newview/app_settings/settings.xml     |  11 ++
 linden/indra/newview/llfloaterpreference.cpp       |   1 +
 linden/indra/newview/llpanelaudioprefs.cpp         |  19 ++-
 linden/indra/newview/llpanelaudioprefs.h           |   4 +
 linden/indra/newview/llviewerparcelmedia.cpp       | 158 +++++++++++++++++----
 linden/indra/newview/llviewerparcelmedia.h         |  40 +++++-
 .../default/xui/en-us/floater_media_filter.xml     |  26 +++-
 .../default/xui/en-us/panel_preferences_audio.xml  |  15 +-
 linden/indra/newview/slfloatermediafilter.cpp      | 116 ++++++++-------
 linden/indra/newview/slfloatermediafilter.h        |   7 +
 10 files changed, 308 insertions(+), 89 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2a508ee..5bd8c7e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -8017,6 +8017,17 @@
       <integer>100</integer>
     </array>
   </map>
+  <key>MediaFilterOnlyRemoteCommands</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether Media Filter should only filter actions initiated remotely</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>MediaOnAPrimUI</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 0f81be6..02c2014 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -365,6 +365,7 @@ void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_vi
 void LLPreferenceCore::updateIsLoggedIn(bool enable)
 {
 	mPrefsIM->preparePerAccountPrefs(enable);
+	mAudioPanel->updateIsLoggedIn(enable);
 }
 
 void LLPreferenceCore::refreshEnabledGraphics()
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 1acfcbb..fab2771 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -55,12 +55,14 @@
 #include "llslider.h"
 #include "llsliderctrl.h"
 #include "llspinctrl.h"
+#include "llstartup.h"
 #include "lltextbox.h"
 #include "llui.h"
 #include "llviewerparcelmgr.h"
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
+#include "slfloatermediafilter.h"
 
 #include "hippogridmanager.h"
 
@@ -92,6 +94,8 @@ BOOL LLPanelAudioPrefs::postBuild()
 	refreshValues(); // initialize member data from saved settings
 	childSetLabelArg("L$ Change Threshold", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 	childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind"));
+	childSetAction("show_media_filter", onShowMediaFilter, this);
+	updateIsLoggedIn(LLStartUp::isLoggedIn());
 
 	return TRUE;
 }
@@ -112,7 +116,7 @@ void LLPanelAudioPrefs::refreshValues()
 
 	mPreviousStreamingMusic = gSavedSettings.getBOOL("AudioStreamingMusic");
 	mPreviousStreamingVideo = gSavedSettings.getBOOL("AudioStreamingVideo");
-
+	mPreviousEnableMediaFilter = gSavedSettings.getBOOL("MediaEnableFilter");
 	mPreviousMuteAudio = gSavedSettings.getBOOL("MuteAudio");
 	mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized");
 }
@@ -140,8 +144,19 @@ void LLPanelAudioPrefs::cancel()
 
 	gSavedSettings.setBOOL("AudioStreamingMusic", mPreviousStreamingMusic );
 	gSavedSettings.setBOOL("AudioStreamingVideo", mPreviousStreamingVideo );
+	gSavedSettings.setBOOL("MediaEnableFilter", mPreviousEnableMediaFilter );
 
-	
 	gSavedSettings.setBOOL("MuteAudio", mPreviousMuteAudio );
 	gSavedSettings.setBOOL("MuteWhenMinimized", mPreviousMuteWhenMinimized );
 }
+
+//static
+void LLPanelAudioPrefs::onShowMediaFilter(void* data)
+{
+	SLFloaterMediaFilter::toggleInstance();
+}
+
+void LLPanelAudioPrefs::updateIsLoggedIn(const bool enable)
+{
+	childSetEnabled("show_media_filter", enable);
+}
diff --git a/linden/indra/newview/llpanelaudioprefs.h b/linden/indra/newview/llpanelaudioprefs.h
index 21d2f59..a0733ba 100644
--- a/linden/indra/newview/llpanelaudioprefs.h
+++ b/linden/indra/newview/llpanelaudioprefs.h
@@ -54,6 +54,9 @@ public:
 	virtual BOOL postBuild();
 
 	static void* createVolumePanel(void* data);
+	static void onShowMediaFilter(void* data);
+
+	void updateIsLoggedIn(const bool);
 	
 private:
 	void refreshValues();
@@ -75,6 +78,7 @@ private:
 
 	BOOL			mPreviousStreamingMusic;
 	BOOL			mPreviousStreamingVideo;
+	BOOL			mPreviousEnableMediaFilter;
 	BOOL            mPreviousMuteAudio;
 	BOOL            mPreviousMuteWhenMinimized;
 };
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 01e86e2..386a86e 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -49,6 +49,7 @@
 #include "llpluginclassmedia.h"
 #include "llnotify.h"
 #include "llsdserialize.h"
+#include "llmemory.h"
 
 #include "lloverlaybar.h"
 #include "slfloatermediafilter.h"
@@ -64,6 +65,7 @@ LLSD LLViewerParcelMedia::sMediaFilterList;
 std::set<std::string> LLViewerParcelMedia::sMediaQueries;
 std::set<std::string> LLViewerParcelMedia::sAllowedMedia;
 std::set<std::string> LLViewerParcelMedia::sDeniedMedia;
+LLPointer<LLViewerParcelMediaInfo> LLViewerParcelMedia::sSavedMediaInfo;
 
 // Local functions
 bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel);
@@ -186,7 +188,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 }
 
 // static
-void LLViewerParcelMedia::play(LLParcel* parcel, bool filter)
+void LLViewerParcelMedia::play(LLParcel* parcel, bool filter, const ECommandOrigin origin)
 {
 	lldebugs << "LLViewerParcelMedia::play" << llendl;
 
@@ -198,12 +200,13 @@ void LLViewerParcelMedia::play(LLParcel* parcel, bool filter)
 	std::string media_url = parcel->getMediaURL();
 	LLStringUtil::trim(media_url);
 
-	if (!media_url.empty() && gSavedSettings.getBOOL("MediaEnableFilter") && (filter || !allowedMedia(media_url)))
+	if (!media_url.empty() && gSavedSettings.getBOOL("MediaEnableFilter") && filter
+		&& (!allowedMedia(media_url) || origin == COMMAND_ORIGIN_REMOTE))
 	{
 		// If filtering is needed or in case media_url just changed
 		// to something we did not yet approve.
 		LLViewerParcelMediaAutoPlay::playStarted();
-		filterMedia(parcel, 0);
+		filterMedia(parcel, 0, origin);
 		return;
 	}
 
@@ -384,7 +387,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
 			else
 			{
 				LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-				play(parcel);
+				play(parcel, true, COMMAND_ORIGIN_REMOTE);
 			}
 		}
 		else
@@ -400,7 +403,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
 		if(sMediaImpl.isNull())
 		{
 			LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-			play(parcel);
+			play(parcel, true, COMMAND_ORIGIN_REMOTE);
 		}
 		seek(time);
 	}
@@ -437,33 +440,38 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
 	}
 
 	LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-	BOOL same = FALSE;
 	if (parcel)
 	{
-		same = ((parcel->getMediaURL() == media_url) &&
-				(parcel->getMediaType() == media_type) &&
-				(parcel->getMediaID() == media_id) &&
-				(parcel->getMediaWidth() == media_width) &&
-				(parcel->getMediaHeight() == media_height) &&
-				(parcel->getMediaAutoScale() == media_auto_scale) &&
-				(parcel->getMediaLoop() == media_loop));
-
-		if (!same)
+		LLViewerParcelMediaInfo* new_info = new LLViewerParcelMediaInfo(media_url, media_type, media_id, media_width, media_height, media_auto_scale, media_loop);
+		LLViewerParcelMediaInfo* current_info = new LLViewerParcelMediaInfo(parcel);
+		if (new_info != current_info)
 		{
+			if (!sSavedMediaInfo || (sSavedMediaInfo && !sSavedMediaInfo->sameParcel(parcel)))
+			{
+				// only save if no previously saved media info, because
+				// we want to remeber the original parcel media info.
+				sSavedMediaInfo = current_info;
+			}
 			// temporarily store these new values in the parcel
-			parcel->setMediaURL(media_url);
-			parcel->setMediaType(media_type);
-			parcel->setMediaID(media_id);
-			parcel->setMediaWidth(media_width);
-			parcel->setMediaHeight(media_height);
-			parcel->setMediaAutoScale(media_auto_scale);
-			parcel->setMediaLoop(media_loop);
-
-			play(parcel);
+			new_info->applyToParcel(parcel);
+
+			play(parcel, true, COMMAND_ORIGIN_REMOTE);
 		}
 
 	}
 }
+
+//static
+void LLViewerParcelMedia::undoParcelMediaUpdate()
+{
+	LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	if (sSavedMediaInfo.notNull() && parcel)
+	{
+		sSavedMediaInfo->applyToParcel(parcel);
+	}
+	sSavedMediaInfo = NULL;
+}
+
 // Static
 /////////////////////////////////////////////////////////////////////////////////////////
 void LLViewerParcelMedia::sendMediaNavigateMessage(const std::string& url)
@@ -619,7 +627,7 @@ void LLViewerParcelMedia::playStreamingMusic(LLParcel* parcel, bool filter)
 	{
 		// If filtering is needed or in case music_url just changed
 		// to something we did not yet approve.
-		filterMedia(parcel, 1);
+		filterMedia(parcel, 1, COMMAND_ORIGIN_LOCAL);
 	}
 	else if (gAudioStream)
 	{
@@ -675,13 +683,13 @@ bool LLViewerParcelMedia::allowedMedia(std::string media_url)
 	return false;
 }
 
-void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
+void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type, const ECommandOrigin origin)
 {
 	std::string media_action;
 	std::string media_url;
 	std::string domain;
 	std::string ip;
-
+	
 	if (parcel != LLViewerParcelMgr::getInstance()->getAgentParcel())
 	{
 		// The parcel just changed (may occur right out after a TP)
@@ -775,12 +783,33 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
 	}
 	if (media_action == "ignore")
 	{
-		if (type == 1)
+		if (type == 0)
+		{
+			undoParcelMediaUpdate();
+		}
+		else if (type == 1)
 		{
 			LLViewerParcelMedia::stopStreamingMusic();
 		}
 		return;
 	}
+	// skip local-originating play commands, unless the url is blacklisted.
+	if (gSavedSettings.getBOOL("MediaFilterOnlyRemoteCommands")
+		&& (origin != COMMAND_ORIGIN_REMOTE)
+		&& (media_action != "ignore"))
+	{
+		sAllowedMedia.insert(domain);
+		SLFloaterMediaFilter::setDirty();
+		if (type == 0)
+		{
+			play(parcel, false);
+		}
+		else
+		{
+			playStreamingMusic(parcel, false);
+		}
+		return;
+	}
 
 	LLSD args;
 	if (ip != domain && domain.find('/') == std::string::npos)
@@ -795,6 +824,10 @@ void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
 	if (media_action == "deny")
 	{
 		LLNotifications::instance().add("MediaBlocked", args);
+		if (type == 0)
+		{
+			undoParcelMediaUpdate();
+		}
 		if (type == 1)
 		{
 			LLViewerParcelMedia::stopStreamingMusic();
@@ -873,10 +906,15 @@ void callback_media_alert(const LLSD &notification, const LLSD &response, LLParc
 		{
 			LLViewerParcelMedia::sDeniedMedia.insert(ip);
 		}
-		if (type == 1)
+		if (type == 0)
+		{
+			LLViewerParcelMedia::undoParcelMediaUpdate();
+		}
+		else if (type == 1)
 		{
 			LLViewerParcelMedia::stopStreamingMusic();
 		}
+		
 		if (option == 1) // Deny
 		{
 			LLNotifications::instance().add("MediaBlocked", args);
@@ -1040,3 +1078,65 @@ std::string LLViewerParcelMedia::extractDomain(std::string url)
 	return url;
 }
 
+LLViewerParcelMediaInfo::LLViewerParcelMediaInfo(const std::string url,
+												 const std::string type,
+												 const LLUUID media_id,
+												 const S32 width,
+												 const S32 height,
+												 const U8 scale,
+												 const U8 loop)
+	:
+	mMediaURL(url),
+	mMediaType(type),
+	mMediaID(media_id),
+	mMediaWidth(width),
+	mMediaHeight(height),
+	mMediaAutoScale(scale),
+	mMediaLoop(loop)
+{
+	LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	mParcelLocalID = parcel ? parcel->getLocalID() : 0;
+}
+
+LLViewerParcelMediaInfo::LLViewerParcelMediaInfo(const LLParcel* parcel)
+{
+	mMediaURL = parcel->getMediaURL();
+	mMediaType = parcel->getMediaType();
+	mMediaID = parcel->getMediaID();
+	mMediaWidth = parcel->getMediaWidth();
+	mMediaHeight = parcel->getMediaHeight();
+	mMediaAutoScale = parcel->getMediaAutoScale();
+	mMediaLoop = parcel->getMediaLoop();
+	mParcelLocalID = parcel->getLocalID();
+}
+
+void LLViewerParcelMediaInfo::applyToParcel(LLParcel* parcel)
+{
+	if (parcel && sameParcel(parcel))
+	{
+		parcel->setMediaURL(mMediaURL);
+		parcel->setMediaType(mMediaType);
+		parcel->setMediaID(mMediaID);
+		parcel->setMediaWidth(mMediaWidth);
+		parcel->setMediaHeight(mMediaHeight);
+		parcel->setMediaAutoScale(mMediaAutoScale);
+		parcel->setMediaLoop(mMediaLoop);
+	}
+}
+
+bool LLViewerParcelMediaInfo::sameParcel(const LLParcel* parcel) const
+{
+	return parcel && (parcel->getLocalID() == mParcelLocalID);
+}
+
+bool LLViewerParcelMediaInfo::operator==(const LLViewerParcelMediaInfo &rhs) const
+{
+	return 	(mMediaURL == rhs.mMediaURL) &&
+			(mMediaType == rhs.mMediaType) &&
+			(mMediaID == rhs.mMediaID) &&
+			(mMediaWidth == rhs.mMediaWidth) &&
+			(mMediaHeight == rhs.mMediaHeight) &&
+			(mMediaAutoScale == rhs.mMediaAutoScale) &&
+			(mMediaLoop == rhs.mMediaLoop) &&
+			(mParcelLocalID == rhs.mParcelLocalID);
+}
\ No newline at end of file
diff --git a/linden/indra/newview/llviewerparcelmedia.h b/linden/indra/newview/llviewerparcelmedia.h
index 7531a0f..f4c4312 100644
--- a/linden/indra/newview/llviewerparcelmedia.h
+++ b/linden/indra/newview/llviewerparcelmedia.h
@@ -34,6 +34,7 @@
 #define LLVIEWERPARCELMEDIA_H
 
 #include "llviewermedia.h"
+#include "llmemory.h"
 
 // For use by other patches so they know that media filtering is implemented.
 #define MEDIA_FILTERING 1
@@ -41,6 +42,7 @@
 class LLMessageSystem;
 class LLParcel;
 class LLViewerParcelMediaNavigationObserver;
+class LLViewerParcelMediaInfo;
 
 
 // This class understands land parcels, network traffic, LSL media
@@ -49,6 +51,13 @@ class LLViewerParcelMediaNavigationObserver;
 class LLViewerParcelMedia : public LLViewerMediaObserver
 {
 	LOG_CLASS(LLViewerParcelMedia);
+	private:
+		typedef enum e_command_origin
+		{
+			COMMAND_ORIGIN_LOCAL,
+			COMMAND_ORIGIN_REMOTE
+		} ECommandOrigin;
+
 	public:
 		static void initClass();
 		static void cleanupClass();
@@ -57,14 +66,14 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
 			// called when the agent's parcel has a new URL, or the agent has
 			// walked on to a new parcel with media
 
-		static void play(LLParcel* parcel, bool filter = true);
+		static void play(LLParcel* parcel, bool filter = true, const ECommandOrigin origin = COMMAND_ORIGIN_LOCAL);
 			// user clicked play button in media transport controls
 		static void playStreamingMusic(LLParcel* parcel, bool filter = true);
 			// play the parcel music stream
 		static void stopStreamingMusic();
 			// stop the parcel music stream
 
-		static void filterMedia(LLParcel* parcel, U32 type); // type: 0 = media, 1 = streaming music
+		static void filterMedia(LLParcel* parcel, U32 type, const ECommandOrigin origin); // type: 0 = media, 1 = streaming music
 		static bool allowedMedia(std::string media_url);
 
 		static bool loadDomainFilterList();
@@ -90,6 +99,7 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
 
 		static void processParcelMediaCommandMessage( LLMessageSystem *msg, void ** );
 		static void processParcelMediaUpdate( LLMessageSystem *msg, void ** );
+		static void undoParcelMediaUpdate(); // reset the parcel's media to what it was before ParcelMediaUpdate
 		static void sendMediaNavigateMessage(const std::string& url);
 		
 		// inherited from LLViewerMediaObserver
@@ -107,6 +117,7 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
 		static std::set<std::string> sMediaQueries;
 		static std::set<std::string> sAllowedMedia;
 		static std::set<std::string> sDeniedMedia;
+		static LLPointer<LLViewerParcelMediaInfo> sSavedMediaInfo; // The parcel original media (before a remote command is applied)
 };
 
 
@@ -120,4 +131,29 @@ public:
 
 };
 
+class LLViewerParcelMediaInfo : public LLRefCount
+{
+public:
+	LLViewerParcelMediaInfo(const std::string url, 
+							const std::string type,
+							const LLUUID media_id,
+							const S32 width,
+							const S32 height,
+							const U8 scale,
+							const U8 loop);
+	LLViewerParcelMediaInfo(const LLParcel* parcel);
+	~LLViewerParcelMediaInfo() {}
+	void applyToParcel(LLParcel* parcel);
+	bool sameParcel(const LLParcel* parcel) const;
+	bool operator==(const LLViewerParcelMediaInfo &rhs) const;
+private:
+	std::string			mMediaURL;
+	std::string 		mMediaType;
+	LLUUID				mMediaID;
+	S32					mMediaWidth;
+	S32					mMediaHeight;
+	U8					mMediaAutoScale;
+	U8                  mMediaLoop;
+	S32					mParcelLocalID;
+};
 #endif
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
index 5faaf1a..f0fb3a3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floatermediafilter" title="Media Filter" rect_control="MediaFilterRect"
  can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
- height="350" width="600" min_height="350" min_width="600">
+ height="410" width="600" min_height="350" min_width="600">
+
+	<check_box control_name="MediaEnableFilter" name="enable_mediafilter" label="Enable Media Filter"
+	 initial_value="true" tool_tip="Enables filtering media URLs by domain names."
+	 font="SansSerifSmall" mouse_opaque="true"
+	 left="14" height="16" bottom_delta="-45" width="4500" follows="left|top" />
+
+	<check_box control_name="MediaFilterOnlyRemoteCommands" name="filter_only_remote"
+	 label="Filter only when a script initiates the stream (less secure)" initial_value="false" 
+	 tool_tip="This will prevent popups asking about URLs that are permanently set on a parcel. 
+Only scripted changes to the media URL and scripted requests to start playing a stream will be filtered."
+	 font="SansSerifSmall" mouse_opaque="true"
+	 left_delta="14" height="16" width="450" follows="left|top" />
+
 	<text name="info1" font="SansSerif" mouse_opaque="true" halign="center"
-	 bottom_delta="-45" left="20" height="20" width="560" follows="left|right|top">
+	 bottom_delta="-40" left="20" height="20" width="560" follows="left|right|top">
 		Domains in bold are in the persistent list (i.e. they are whitelisted or blacklisted).
 	</text>
 	<text name="info2" font="SansSerif" mouse_opaque="true" halign="center"
@@ -14,7 +27,7 @@
 	<scroll_list name="whitelist_list" follows="top|bottom|left"
 	 background_visible="true" mouse_opaque="true"
 	 multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
-	 bottom_delta="-205" left="15" height="200" width="280">
+	 bottom_delta="-200" left="15" height="200" width="280">
 		<column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
 	</scroll_list>
 
@@ -69,10 +82,13 @@
 	 tool_tip="Enter the new URL, domain name, IP or scripted object HTTP server path here"
 	 select_all_on_focus_received="true" select_on_focus="true"
 	 bevel_style="in" border_style="line" border_thickness="1"
-	 bottom_delta="-22"	right="-100" height="20" left="15" follows="left|bottom|right"/>
+	 bottom_delta="-22"	right="-180" height="20" left="15" follows="left|bottom|right"/>
 
+	<button name="cancel_domain" font="SansSerif" label="Cancel" halign="center" enabled="false"
+	 mouse_opaque="true" follows="bottom|right"
+	 bottom_delta="0" right="-15" height="20" width="80"/>
 	<button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
 	 tool_tip="Add to the list"
 	 mouse_opaque="true" follows="bottom|right"
-	 bottom_delta="0" right="-15" height="20" width="80"/>
+	 bottom_delta="0" right="-95" height="20" width="80"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index c6bb938..3415b1b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -9,13 +9,13 @@
 		Volume:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-202" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
 		Streaming:
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-285" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-315" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
 	     mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
 		Audio:
@@ -42,7 +42,16 @@
 	     initial_value="true" label="Automatically play media" left="162"
 	     mouse_opaque="true" name="auto_streaming_video" radio_style="false"
 	     width="338" />
-	<check_box bottom_delta="-27" control_name="MuteWhenMinimized" enabled="true"
+	<check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="true" label="Filter media URLs" left="142"
+	     mouse_opaque="true" name="enable_media_filter" radio_style="false"
+	     width="200" />
+	<button name="show_media_filter" font="SansSerif" label="Media Filter Settings" halign="center"
+	     tool_tip="Edit settings and the blocked and allowed lists for the Media Filter."
+	     enabled="false" mouse_opaque="true" follows="top|right"
+	     bottom_delta="-2" right="-15" height="20" width="180" />
+	<check_box bottom_delta="-33" control_name="MuteWhenMinimized" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 	     label="Mute audio when window minimized" left="142" mouse_opaque="true"
 	     name="mute_when_minimized" radio_style="false" width="215" />
diff --git a/linden/indra/newview/slfloatermediafilter.cpp b/linden/indra/newview/slfloatermediafilter.cpp
index 7b287e0..b0d9c26 100644
--- a/linden/indra/newview/slfloatermediafilter.cpp
+++ b/linden/indra/newview/slfloatermediafilter.cpp
@@ -43,6 +43,7 @@
 
 SLFloaterMediaFilter* SLFloaterMediaFilter::sInstance = NULL;
 bool SLFloaterMediaFilter::sIsWhitelist = false;
+bool SLFloaterMediaFilter::sIsAdding = false;
 bool SLFloaterMediaFilter::sShowIPs = false;
 
 SLFloaterMediaFilter::SLFloaterMediaFilter() : LLFloater(std::string("media filter")), mIsDirty(false)
@@ -69,10 +70,12 @@ BOOL SLFloaterMediaFilter::postBuild()
 		childSetAction("add_blacklist", onBlacklistAdd, this);
 		childSetAction("remove_blacklist", onBlacklistRemove, this);
 		childSetAction("commit_domain", onCommitDomain, this);
+		childSetAction("cancel_domain", onCancelDomain, this);
 		childSetUserData("whitelist_list", this);
 		childSetUserData("blacklist_list", this);
 		mIsDirty = true;
 	}
+	gSavedSettings.getControl("MediaEnableFilter")->getSignal()->connect(boost::bind(&onMediaEnableFilterChanged, _1));
 
 	return TRUE;
 }
@@ -174,21 +177,7 @@ void SLFloaterMediaFilter::draw()
 		mWhitelistSLC->setScrollPos(whitescrollpos);
 		mBlacklistSLC->setScrollPos(blackscrollpos);
 
-		if (!gSavedSettings.getBOOL("MediaEnableFilter"))
-		{
-			childDisable("clear_lists");
-			childDisable("show_ips");
-			childDisable("blacklist_list");
-			childDisable("whitelist_list");
-			childDisable("remove_whitelist");
-			childDisable("add_whitelist");
-			childDisable("remove_blacklist");
-			childDisable("add_blacklist");
-			childDisable("match_ip");
-			childDisable("input_domain");
-			childDisable("commit_domain");
-			childSetText("add_text", std::string("****** WARNING: media filtering is currently DISABLED ******"));
-		}
+		updateWidgets();
 
 		mIsDirty = false;
 		sShowIPs = false;
@@ -197,6 +186,47 @@ void SLFloaterMediaFilter::draw()
 	LLFloater::draw();
 }
 
+void SLFloaterMediaFilter::updateWidgets()
+{
+	bool enabled = gSavedSettings.getBOOL("MediaEnableFilter");
+	childSetEnabled("clear_lists", enabled && !sIsAdding);
+	childSetEnabled("show_ips", enabled && !sIsAdding);
+	childSetEnabled("blacklist_list", enabled && !sIsAdding);
+	childSetEnabled("whitelist_list", enabled && !sIsAdding);
+	childSetEnabled("remove_whitelist", enabled && !sIsAdding);
+	childSetEnabled("add_whitelist", enabled && !sIsAdding);
+	childSetEnabled("remove_blacklist", enabled && !sIsAdding);
+	childSetEnabled("add_blacklist", enabled && !sIsAdding);
+	childSetEnabled("match_ip", enabled);
+	childSetEnabled("input_domain", enabled && sIsAdding);
+	childSetEnabled("commit_domain", enabled && sIsAdding);
+	childSetEnabled("cancel_domain", enabled && sIsAdding);
+	childSetEnabled("filter_only_remote", enabled);
+	childSetEnabled("info1", enabled);
+	childSetEnabled("info2", enabled);
+
+	std::string add_text("****** Media filtering is currently DISABLED ******");
+	if (enabled)
+	{
+		if (sIsAdding)
+		{
+			if (sIsWhitelist)
+			{
+				add_text = "Enter the domain/url to add to the white list:";
+			}
+			else
+			{
+				add_text = "Enter the domain/url to add to the black list:";
+			}
+		}
+		else
+		{
+			add_text = "New Domain:";
+		}
+	}
+	childSetText("add_text", add_text);
+}
+
 void SLFloaterMediaFilter::setDirty()
 {
     if (sInstance)
@@ -255,18 +285,9 @@ void SLFloaterMediaFilter::onWhitelistAdd(void* data)
 	{
 		return;
 	}
-	sInstance->childDisable("clear_lists");
-	sInstance->childDisable("show_ips");
-	sInstance->childDisable("blacklist_list");
-	sInstance->childDisable("whitelist_list");
-	sInstance->childDisable("remove_whitelist");
-	sInstance->childDisable("add_whitelist");
-	sInstance->childDisable("remove_blacklist");
-	sInstance->childDisable("add_blacklist");
-	sInstance->childEnable("input_domain");
-	sInstance->childEnable("commit_domain");
-	sInstance->childSetText("add_text", std::string("Enter the domain/url to add to the white list:"));
 	sIsWhitelist = true;
+	sIsAdding = true;
+	sInstance->updateWidgets();
 }
 
 void SLFloaterMediaFilter::onWhitelistRemove(void* data)
@@ -329,18 +350,9 @@ void SLFloaterMediaFilter::onBlacklistAdd(void* data)
 	{
 		return;
 	}
-	sInstance->childDisable("clear_lists");
-	sInstance->childDisable("show_ips");
-	sInstance->childDisable("blacklist_list");
-	sInstance->childDisable("whitelist_list");
-	sInstance->childDisable("remove_whitelist");
-	sInstance->childDisable("add_whitelist");
-	sInstance->childDisable("remove_blacklist");
-	sInstance->childDisable("add_blacklist");
-	sInstance->childEnable("input_domain");
-	sInstance->childEnable("commit_domain");
-	sInstance->childSetText("add_text", std::string("Enter the domain/url to add to the black list:"));
 	sIsWhitelist = false;
+	sIsAdding = true;
+	sInstance->updateWidgets();
 }
 
 void SLFloaterMediaFilter::onBlacklistRemove(void* data)
@@ -452,17 +464,25 @@ void SLFloaterMediaFilter::onCommitDomain(void* data)
 		LLViewerParcelMedia::saveDomainFilterList();
 	}
 
-	sInstance->childEnable("clear_lists");
-	sInstance->childEnable("show_ips");
-	sInstance->childEnable("blacklist_list");
-	sInstance->childEnable("whitelist_list");
-	sInstance->childEnable("remove_whitelist");
-	sInstance->childEnable("add_whitelist");
-	sInstance->childEnable("remove_blacklist");
-	sInstance->childEnable("add_blacklist");
-	sInstance->childDisable("input_domain");
-	sInstance->childDisable("commit_domain");
-	sInstance->childSetText("add_text", std::string("New domain:"));
 	sInstance->childSetText("input_domain", std::string(""));
+	sIsAdding = false;
+	setDirty();
+}
+
+//static
+void SLFloaterMediaFilter::onCancelDomain(void* data)
+{
+	if (!sInstance)
+	{
+		return;
+	}
+	sInstance->childSetText("input_domain", std::string(""));
+	sIsAdding = false;
+	setDirty();
+}
+
+//static
+void SLFloaterMediaFilter::onMediaEnableFilterChanged(const LLSD& newvalue)
+{
 	setDirty();
 }
diff --git a/linden/indra/newview/slfloatermediafilter.h b/linden/indra/newview/slfloatermediafilter.h
index aafa5a2..9067c74 100644
--- a/linden/indra/newview/slfloatermediafilter.h
+++ b/linden/indra/newview/slfloatermediafilter.h
@@ -38,6 +38,7 @@
 
 class LLScrollListCtrl;
 class LLButton;
+class LLSD;
 
 class SLFloaterMediaFilter : public LLFloater
 {
@@ -58,10 +59,16 @@ public:
 	static void onBlacklistAdd(void*);
 	static void onBlacklistRemove(void*);
 	static void onCommitDomain(void*);
+	static void onCancelDomain(void*);
+	static void onMediaEnableFilterChanged(const LLSD& newvalue);
+
+private:
+	void updateWidgets();
 
 private:
 	static bool sIsWhitelist;
 	static bool sShowIPs;
+	static bool sIsAdding;
 	LLScrollListCtrl* mWhitelistSLC;
 	LLScrollListCtrl* mBlacklistSLC;
 	bool mIsDirty;
-- 
cgit v1.1


From 1235da40f858cebed5d999dc35196ab62d3de77e Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Fri, 1 Apr 2011 16:29:49 +0300
Subject: Fix #838: disable hiding of stream urls

NoObscuredURL Patch from Henri Beauchamp, applied by hand because of
changes between Imprudence and Snowglobe.
---
 linden/indra/llinventory/llparcel.cpp              | 13 +------
 linden/indra/llinventory/llparcel.h                |  6 ---
 linden/indra/newview/llmediaremotectrl.cpp         |  2 +-
 linden/indra/newview/llpanellandaudio.cpp          |  8 ----
 linden/indra/newview/llpanellandaudio.h            |  1 -
 linden/indra/newview/llpanellandmedia.cpp          | 38 +------------------
 .../skins/default/xui/en-us/floater_about_land.xml | 44 ++++------------------
 7 files changed, 11 insertions(+), 101 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 39605eb..f2c6e97 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -195,8 +195,6 @@ void LLParcel::init(const LLUUID &owner_id,
 	mMediaID.setNull();
 	mMediaAutoScale = 0;
 	mMediaLoop = TRUE;
-	mObscureMedia = 1;
-	mObscureMusic = 1;
 	mMediaWidth = 0;
 	mMediaHeight = 0;
 	setMediaCurrentURL(LLStringUtil::null);
@@ -691,9 +689,8 @@ void LLParcel::packMessage(LLSD& msg)
 	msg["auto_scale"] = getMediaAutoScale();
 	msg["media_loop"] = getMediaLoop();
 	msg["media_current_url"] = getMediaCurrentURL();
-	msg["obscure_media"] = getObscureMedia();
-	msg["obscure_music"] = getObscureMusic();
-	msg["media_id"] = getMediaID();
+	msg["obscure_media"] = FALSE; // OBSOLETE - no longer used
+	msg["obscure_music"] = FALSE; // OBSOLETE - no longer used
 	msg["media_allow_navigate"] = getMediaAllowNavigate();
 	msg["media_prevent_camera_zoom"] = getMediaPreventCameraZoom();
 	msg["media_url_timeout"] = getMediaURLTimeout();
@@ -757,8 +754,6 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
 		msg->getS32("MediaData", "MediaWidth", mMediaWidth);
 		msg->getS32("MediaData", "MediaHeight", mMediaHeight);
 		msg->getU8 ( "MediaData", "MediaLoop", mMediaLoop );
-		msg->getU8 ( "MediaData", "ObscureMedia", mObscureMedia );
-		msg->getU8 ( "MediaData", "ObscureMusic", mObscureMusic );
 	}
 	else
 	{
@@ -766,8 +761,6 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
 						// thats what we want -- AW
 		setMediaDesc(std::string("No Description available without Server Upgrade"));
 		mMediaLoop = true;
-		mObscureMedia = true;
-		mObscureMusic = true;
 	}
 
 	if(msg->getNumberOfBlocks("MediaLinkSharing") > 0)
@@ -1233,8 +1226,6 @@ void LLParcel::clearParcel()
     setMediaDesc(LLStringUtil::null);
 	setMediaAutoScale(0);
 	setMediaLoop(TRUE);
-	mObscureMedia = 1;
-	mObscureMusic = 1;
 	mMediaWidth = 0;
 	mMediaHeight = 0;
 	setMediaCurrentURL(LLStringUtil::null);
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index f102ec4..52f97de 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -244,8 +244,6 @@ public:
 	void	setMediaID(const LLUUID& id) { mMediaID = id; }
 	void	setMediaAutoScale ( U8 flagIn ) { mMediaAutoScale = flagIn; }
 	void    setMediaLoop (U8 loop) { mMediaLoop = loop; }
-	void	setObscureMedia( U8 flagIn ) { mObscureMedia = flagIn; }
-	void	setObscureMusic( U8 flagIn ) { mObscureMusic = flagIn; }
 	void setMediaWidth(S32 width);
 	void setMediaHeight(S32 height);
 	void setMediaCurrentURL(const std::string& url);
@@ -352,8 +350,6 @@ public:
 	U8				getMediaAutoScale() const	{ return mMediaAutoScale; }
 	U8              getMediaLoop() const        { return mMediaLoop; }
 	const std::string&  getMediaCurrentURL() const { return mMediaCurrentURL; }
-	U8				getObscureMedia() const		{ return mObscureMedia; }
-	U8				getObscureMusic() const		{ return mObscureMusic; }
 	U8              getMediaURLFilterEnable() const   { return mMediaURLFilterEnable; }
 	LLSD            getMediaURLFilterList() const     { return mMediaURLFilterList; }
 	U8              getMediaAllowNavigate() const { return mMediaAllowNavigate; }
@@ -645,8 +641,6 @@ protected:
 	U8					mMediaAutoScale;
 	U8                  mMediaLoop;
 	std::string         mMediaCurrentURL;
-	U8					mObscureMedia;
-	U8					mObscureMusic;
 	LLUUID				mMediaID;
 	U8                  mMediaURLFilterEnable;
 	LLSD                mMediaURLFilterList;
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 8186293..2f6dbdf 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -172,7 +172,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 		{
 			// Set the tooltip
 			// Put this text into xui file
-			media_url = parcel->getObscureMedia() ? mControls->getString("media_hidden_label") : parcel->getMediaURL();
+			media_url = parcel->getMediaURL();
 			media_type = parcel->getMediaType();
 
 			play_media_enabled = true;
diff --git a/linden/indra/newview/llpanellandaudio.cpp b/linden/indra/newview/llpanellandaudio.cpp
index 0247009..8d902b6 100644
--- a/linden/indra/newview/llpanellandaudio.cpp
+++ b/linden/indra/newview/llpanellandaudio.cpp
@@ -91,9 +91,6 @@ BOOL LLPanelLandAudio::postBuild()
 	mMusicURLEdit = getChild<LLLineEditor>("music_url");
 	childSetCommitCallback("music_url", onCommitAny, this);
 
-	mMusicUrlCheck = getChild<LLCheckBoxCtrl>("hide_music_url");
-	childSetCommitCallback("hide_music_url", onCommitAny, this);
-
 	return TRUE;
 }
 
@@ -117,9 +114,6 @@ void LLPanelLandAudio::refresh()
 		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 );
 
@@ -154,7 +148,6 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
 	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;
@@ -185,7 +178,6 @@ void LLPanelLandAudio::onCommitAny(LLUICtrl*, void *userdata)
 	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 );
diff --git a/linden/indra/newview/llpanellandaudio.h b/linden/indra/newview/llpanellandaudio.h
index 3d5d633..82e27f6 100644
--- a/linden/indra/newview/llpanellandaudio.h
+++ b/linden/indra/newview/llpanellandaudio.h
@@ -55,7 +55,6 @@ private:
 	LLCheckBoxCtrl* mCheckSoundLocal;
 	LLRadioGroup*	mRadioVoiceChat;
 	LLLineEditor*	mMusicURLEdit;
-	LLCheckBoxCtrl* mMusicUrlCheck;
 
 	LLSafeHandle<LLParcelSelection>&	mParcel;
 };
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index b7df164..8a0be86 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -80,9 +80,7 @@ LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
 	mMediaSizeCtrlLabel(NULL),
 	mMediaTextureCtrl(NULL),
 	mMediaAutoScaleCheck(NULL),
-	mMediaLoopCheck(NULL),
-	mMediaUrlCheck(NULL),
-	mMusicUrlCheck(NULL)
+	mMediaLoopCheck(NULL)
 {
 }
 
@@ -132,12 +130,6 @@ BOOL LLPanelLandMedia::postBuild()
 	mMediaLoopCheck = getChild<LLCheckBoxCtrl>("media_loop");
 	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);
-
 	mMediaURLEdit = getChild<LLLineEditor>("media_url");
 	childSetCommitCallback("media_url", onCommitAny, this);
 
@@ -243,30 +235,6 @@ void LLPanelLandMedia::refresh()
 		mMediaTypeCombo->setEnabled( can_change_media );
 		childSetText("mime_type", mime_type);
 
-		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")
-		{
-			obscure_media = false;
-			mMediaUrlCheck->set( 0 );
-			mMediaUrlCheck->setEnabled( false );
-		}
-
-		mMusicURLEdit->setDrawAsterixes( obscure_music );
-		mMediaURLEdit->setDrawAsterixes( obscure_media );
-
 		mMediaAutoScaleCheck->set( parcel->getMediaAutoScale () );
 		mMediaAutoScaleCheck->setEnabled ( can_change_media );
 
@@ -413,8 +381,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	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();
 	S32 media_width			= (S32)self->mMediaWidthCtrl->get();
 	S32 media_height		= (S32)self->mMediaHeightCtrl->get();
 	LLUUID media_id			= self->mMediaTextureCtrl->getImageAssetID();
@@ -441,8 +407,6 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
 	parcel->setMediaID(media_id);
 	parcel->setMediaAutoScale ( media_auto_scale );
 	parcel->setMediaLoop ( media_loop );
-	parcel->setObscureMedia( obscure_media );
-	parcel->setObscureMusic( obscure_music );
 
 	// Send current parcel data upstream to server
 	LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
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 c8aacba..453bf46 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
@@ -915,32 +915,18 @@ Only large parcels can be listed in search.
 				 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"
+				 bottom_delta="-22"
 				 follows="right|top"
 				 font="SansSerifSmall"
-				 halign="right"
+				 halign="left"
 				 height="16"
 				 length="1"
 				 name="media_reset"
-				 right="-164"
+				 left="80"
 				 tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)"
 				 type="string"
-				 width="185">
+				 width="120">
 				Return to Home URL in:
 			</text>
 			<spinner
@@ -948,14 +934,13 @@ Only large parcels can be listed in search.
 				 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"
+				 left_delta="126"
 				 tool_tip="Amount of time until parcel reverts to default URL (0 for never return)"
 				 width="64" />
 			<text
@@ -964,12 +949,11 @@ Only large parcels can be listed in search.
 				 font="SansSerifSmall"
 				 halign="left"
 				 height="16"
-				 left_delta="70"
+				 left_delta="72"
 				 length="1"
 				 name="minutes"
-				 right="-10"
 				 type="string">
-				Minutes
+				minutes
 			</text>
 			<text
 				 bottom_delta="-22"
@@ -1315,20 +1299,6 @@ Select the thumbnail to choose a different texture.
 				 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"
-- 
cgit v1.1


From 863b11a569a81ff1fec035cf0ce2fc87bfc56f21 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Fri, 1 Apr 2011 16:44:46 +0300
Subject: More #838: fix an errounous deletion 1235da40f8

---
 linden/indra/llinventory/llparcel.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linden')

diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index f2c6e97..4cbb83a 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -691,6 +691,7 @@ void LLParcel::packMessage(LLSD& msg)
 	msg["media_current_url"] = getMediaCurrentURL();
 	msg["obscure_media"] = FALSE; // OBSOLETE - no longer used
 	msg["obscure_music"] = FALSE; // OBSOLETE - no longer used
+	msg["media_id"] = getMediaID();
 	msg["media_allow_navigate"] = getMediaAllowNavigate();
 	msg["media_prevent_camera_zoom"] = getMediaPreventCameraZoom();
 	msg["media_url_timeout"] = getMediaURLTimeout();
-- 
cgit v1.1