https://jira.lindenlab.com/jira/browse/DEV-40649

Media auto refreshes after Whitelist set
This checkin fixes a related issue to this task and prohibits user from (A) adding an item to the whitelist that would invalidate the home URL and (b) adding a home URL that would not pass the whitelist.

8 files changed, 406 insertions, 256 deletions

diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index aa457de2d8..d941f24f49 100644
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -118,6 +118,7 @@ BOOL LLFloaterMediaSettings::postBuild()
 	mTabContainer->addTabPanel( 
 			LLTabContainer::TabPanelParams().
 			panel(mPanelMediaSettingsSecurity));
+	mPanelMediaSettingsSecurity->setParent( this );
 		
 	// restore the last tab viewed from persistance variable storage
 	if (!mTabContainer->selectTab(gSavedSettings.getS32("LastMediaSettingsTab")))
@@ -248,3 +249,28 @@ void LLFloaterMediaSettings::enableOkApplyBtns( bool enable )
 	childSetEnabled( "OK", enable );
 	childSetEnabled( "Apply", enable );
 }
+
+////////////////////////////////////////////////////////////////////////////////
+//
+const std::string LLFloaterMediaSettings::getHomeUrl()
+{
+	if ( mPanelMediaSettingsGeneral )
+		return mPanelMediaSettingsGeneral->getHomeUrl();
+	else
+		return std::string( "" );
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+bool LLFloaterMediaSettings::passesWhiteList( const std::string& test_url )
+{
+	// sanity check - don't think this can happen
+	if ( mPanelMediaSettingsSecurity )
+		// version in security dialog code is specialized so we pass in 
+		// empty string for first parameter since it's not used
+		return mPanelMediaSettingsSecurity->passesWhiteList( "", test_url );
+	else
+		// this is all we can do
+		return false;
+}
diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h
index e2683039cc..17a47cb0f5 100644
--- a/indra/newview/llfloatermediasettings.h
+++ b/indra/newview/llfloatermediasettings.h
@@ -56,6 +56,8 @@ public:
 	static void clearValues( bool editable);
 	void enableOkApplyBtns( bool enable );
 	LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;};
+	const std::string getHomeUrl();
+	bool passesWhiteList( const std::string& test_url );
 
 	bool mIdenticalHasMediaInfo;
 	bool mMultipleMedia;
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 320647ff1a..f2385307db 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1114,8 +1114,8 @@ void LLFloaterTools::getMediaState()
 			// Media data is valid
 			if(media_data_get!=default_media_data)
 			{
-				//TODO: get Meida title
-				//media_title =  media_data_get->getTile();
+				//TODO: get media title
+				//media_title =  media_data_get->getTitle();
 				//LLFloaterMediaSettings::getInstance()->mIdenticalValidMedia = true;
 				media_title = media_data_get.getHomeURL();
 			}
@@ -1149,8 +1149,8 @@ void LLFloaterTools::getMediaState()
 			// Media data is valid
 			if(media_data_get!=default_media_data)
 			{
-				//TODO: get Meida title
-				//media_title =  media_data_get->getTile();
+				//TODO: get media title
+				//media_title =  media_data_get->getTitle();
 				media_title = media_data_get.getHomeURL();
 			}
 			
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp
index a33d9604fe..4b25b47fa3 100644
--- a/indra/newview/llpanelmediasettingsgeneral.cpp
+++ b/indra/newview/llpanelmediasettingsgeneral.cpp
@@ -350,6 +350,16 @@ void LLPanelMediaSettingsGeneral::onClose(bool app_quitting)
 void LLPanelMediaSettingsGeneral::onCommitHomeURL( LLUICtrl* ctrl, void *userdata )
 {
 	LLPanelMediaSettingsGeneral* self =(LLPanelMediaSettingsGeneral *)userdata;
+
+	// check url user is trying to enter for home URL will pass whitelist 
+	// and decline to accept it if it doesn't.
+	std::string home_url = self->mHomeURL->getValue().asString();
+	if ( ! self->mParent->passesWhiteList( home_url ) )
+	{
+		LLNotifications::instance().add("WhiteListInvalidatesHomeUrl");		
+		return;
+	};
+	
 	self->updateMediaPreview();
 }
 
@@ -398,3 +408,10 @@ void LLPanelMediaSettingsGeneral::setParent( LLFloaterMediaSettings* parent )
 {
 	mParent = parent;
 };
+
+////////////////////////////////////////////////////////////////////////////////
+//
+const std::string LLPanelMediaSettingsGeneral::getHomeUrl()
+{
+	return mHomeURL->getValue().asString(); 
+}
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h
index 5acfa39181..c404ad127f 100644
--- a/indra/newview/llpanelmediasettingsgeneral.h
+++ b/indra/newview/llpanelmediasettingsgeneral.h
@@ -63,6 +63,8 @@ public:
 	
 	void updateMediaPreview();
 	void updateCurrentURL();
+
+	const std::string getHomeUrl();
 	
 protected:
 	LLFloaterMediaSettings* mParent;
@@ -74,7 +76,6 @@ private:
 	LLComboBox* mControls;
 	LLCheckBoxCtrl* mAutoLoop;
 	LLCheckBoxCtrl* mFirstClick;
-//	LLTextureCtrl* mMediaPreview;
 	LLCheckBoxCtrl* mAutoZoom;
 	LLCheckBoxCtrl* mAutoPlay;
 	LLCheckBoxCtrl* mAutoScale;
diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp
index cea105d7de..bdbc64e4b0 100644
--- a/indra/newview/llpanelmediasettingssecurity.cpp
+++ b/indra/newview/llpanelmediasettingssecurity.cpp
@@ -1,255 +1,339 @@
-/**
- * @file llpanelmediasettingssecurity.cpp
- * @brief LLPanelMediaSettingsSecurity class implementation
- *
- * $LicenseInfo:firstyear=2009&license=viewergpl$
- * 
- * Copyright (c) 2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "llfloaterreg.h"
-#include "llpanelmediasettingssecurity.h"
-#include "llpanelcontents.h"
-#include "llcheckboxctrl.h"
-#include "llscrolllistctrl.h"
-#include "llscrolllistitem.h"
-#include "lluictrlfactory.h"
-#include "llwindow.h"
-#include "llviewerwindow.h"
-#include "llsdutil.h"
-#include "llselectmgr.h"
-#include "llmediaentry.h"
-#include "llfloaterwhitelistentry.h"
-#include "llfloatermediasettings.h"
-////////////////////////////////////////////////////////////////////////////////
-//
-LLPanelMediaSettingsSecurity::LLPanelMediaSettingsSecurity()
-{
-	// build dialog from XML
-	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_media_settings_security.xml");
-	mCommitCallbackRegistrar.add("Media.whitelistAdd",		boost::bind(&LLPanelMediaSettingsSecurity::onBtnAdd, this));
-	mCommitCallbackRegistrar.add("Media.whitelistDelete",	boost::bind(&LLPanelMediaSettingsSecurity::onBtnDel, this));	
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-BOOL LLPanelMediaSettingsSecurity::postBuild()
-{
-	mEnableWhiteList = getChild< LLCheckBoxCtrl >( LLMediaEntry::WHITELIST_ENABLE_KEY );
-	mWhiteListList = getChild< LLScrollListCtrl >( LLMediaEntry::WHITELIST_KEY );
-
-	childSetAction("whitelist_add", onBtnAdd, this);
-	childSetAction("whitelist_del", onBtnDel, this);
-
-	setDefaultBtn("whitelist_add");
-
-	return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// virtual
-LLPanelMediaSettingsSecurity::~LLPanelMediaSettingsSecurity()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 
-void LLPanelMediaSettingsSecurity::draw()
-{
-	// housekeeping
-	LLPanel::draw();
-
-	// if list is empty, disable DEL button and checkbox to enable use of list
-	if ( mWhiteListList->isEmpty() )
-	{
-		childSetEnabled( "whitelist_del", false );
-		childSetEnabled( LLMediaEntry::WHITELIST_KEY, false );
-		childSetEnabled( LLMediaEntry::WHITELIST_ENABLE_KEY, false );
-	}
-	else
-	{
-		childSetEnabled( "whitelist_del", true );
-		childSetEnabled( LLMediaEntry::WHITELIST_KEY, true );
-		childSetEnabled( LLMediaEntry::WHITELIST_ENABLE_KEY, true );
-	};
-
-	// if nothing is selected, disable DEL button
-	if ( mWhiteListList->getSelectedValue().asString().empty() )
-	{
-		childSetEnabled( "whitelist_del", false );
-	}
-	else
-	{
-		childSetEnabled( "whitelist_del", true );
-	};
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// static 
-void LLPanelMediaSettingsSecurity::initValues( void* userdata, const LLSD& media_settings , bool editable)
-{
-	LLPanelMediaSettingsSecurity *self =(LLPanelMediaSettingsSecurity *)userdata;
-
-	if ( LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo )
-	{
-		if(LLFloaterMediaSettings::getInstance()->mMultipleMedia) 
-		{
-			self->clearValues(self, editable);
-			// only show multiple 
-			return;
-		}
-		
-	}
-	else
-	{
-		if(LLFloaterMediaSettings::getInstance()->mMultipleValidMedia) 
-		{
-			self->clearValues(self, editable);
-			// only show multiple 
-			return;
-		}			
-		
-	}
-	std::string base_key( "" );
-	std::string tentative_key( "" );
-
-	struct 
-	{
-		std::string key_name;
-		LLUICtrl* ctrl_ptr;
-		std::string ctrl_type;
-
-	} data_set [] = 
-	{
-		{ LLMediaEntry::WHITELIST_ENABLE_KEY,	self->mEnableWhiteList,		"LLCheckBoxCtrl" },
-		{ LLMediaEntry::WHITELIST_KEY,			self->mWhiteListList,		"LLScrollListCtrl" },
-		{ "", NULL , "" }
-	};
-
-	for( int i = 0; data_set[ i ].key_name.length() > 0; ++i )
-	{
-		base_key = std::string( data_set[ i ].key_name );
-        tentative_key = base_key + std::string( LLPanelContents::TENTATIVE_SUFFIX );
-
-		// TODO: CP - I bet there is a better way to do this using Boost
-		if ( media_settings[ base_key ].isDefined() )
-		{
-			if ( data_set[ i ].ctrl_type == "LLCheckBoxCtrl" )
-			{
-				static_cast< LLCheckBoxCtrl* >( data_set[ i ].ctrl_ptr )->
-					setValue( media_settings[ base_key ].asBoolean() );
-			}
-			else
-			if ( data_set[ i ].ctrl_type == "LLScrollListCtrl" )
-			{
-				// get control 
-				LLScrollListCtrl* list = static_cast< LLScrollListCtrl* >( data_set[ i ].ctrl_ptr );
-				list->deleteAllItems();
-
-				// points to list of white list URLs
-				LLSD url_list = media_settings[ base_key ];
-
-				// iterate over them and add to scroll list
-				LLSD::array_iterator iter = url_list.beginArray();
-				while( iter != url_list.endArray() )
-				{
-					// TODO: is iter guaranteed to be valid here?
-					std::string url = *iter;
-					list->addSimpleElement( url );
-					++iter;
-				};
-			};
-			data_set[ i ].ctrl_ptr->setEnabled(editable);
-			data_set[ i ].ctrl_ptr->setTentative( media_settings[ tentative_key ].asBoolean() );
-		};
-	};
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// static 
-void LLPanelMediaSettingsSecurity::clearValues( void* userdata , bool editable)
-{
-	LLPanelMediaSettingsSecurity *self =(LLPanelMediaSettingsSecurity *)userdata;
-	self->mEnableWhiteList->clear();
-	self->mWhiteListList->deleteAllItems();
-	self->mEnableWhiteList->setEnabled(editable);
-	self->mWhiteListList->setEnabled(editable);
-}
-////////////////////////////////////////////////////////////////////////////////
-// static
-void LLPanelMediaSettingsSecurity::apply( void* userdata )
-{
-	LLPanelMediaSettingsSecurity *self =(LLPanelMediaSettingsSecurity *)userdata;
-
-	// build LLSD Fragment
-	LLSD media_data_security;
-	self->getValues(media_data_security);
-	// this merges contents of LLSD passed in with what's there so this is ok
-	LLSelectMgr::getInstance()->selectionSetMediaData( media_data_security );
-}
-
+/**

+ * @file llpanelmediasettingssecurity.cpp

+ * @brief LLPanelMediaSettingsSecurity class implementation

+ *

+ * $LicenseInfo:firstyear=2009&license=viewergpl$

+ * 

+ * Copyright (c) 2009, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+#include "llfloaterreg.h"

+#include "llpanelmediasettingssecurity.h"

+#include "llpanelcontents.h"

+#include "llcheckboxctrl.h"

+#include "llscrolllistctrl.h"

+#include "llscrolllistitem.h"

+#include "lluictrlfactory.h"

+#include "llwindow.h"

+#include "llviewerwindow.h"

+#include "llsdutil.h"

+#include "llselectmgr.h"

+#include "llmediaentry.h"

+#include "llfloaterwhitelistentry.h"

+#include "llfloatermediasettings.h"

+////////////////////////////////////////////////////////////////////////////////

+//

+LLPanelMediaSettingsSecurity::LLPanelMediaSettingsSecurity() :

+	mParent( NULL )

+{

+	// build dialog from XML

+	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_media_settings_security.xml");

+	mCommitCallbackRegistrar.add("Media.whitelistAdd",		boost::bind(&LLPanelMediaSettingsSecurity::onBtnAdd, this));

+	mCommitCallbackRegistrar.add("Media.whitelistDelete",	boost::bind(&LLPanelMediaSettingsSecurity::onBtnDel, this));	

+}

+

+////////////////////////////////////////////////////////////////////////////////

+//

+BOOL LLPanelMediaSettingsSecurity::postBuild()

+{

+	mEnableWhiteList = getChild< LLCheckBoxCtrl >( LLMediaEntry::WHITELIST_ENABLE_KEY );

+	mWhiteListList = getChild< LLScrollListCtrl >( LLMediaEntry::WHITELIST_KEY );

+

+	childSetAction("whitelist_add", onBtnAdd, this);

+	childSetAction("whitelist_del", onBtnDel, this);

+

+	setDefaultBtn("whitelist_add");

+

+	return true;

+}

+

+////////////////////////////////////////////////////////////////////////////////

+// virtual

+LLPanelMediaSettingsSecurity::~LLPanelMediaSettingsSecurity()

+{

+}

+

+////////////////////////////////////////////////////////////////////////////////

+// 

+void LLPanelMediaSettingsSecurity::draw()

+{

+	// housekeeping

+	LLPanel::draw();

+

+	// if list is empty, disable DEL button and checkbox to enable use of list

+	if ( mWhiteListList->isEmpty() )

+	{

+		childSetEnabled( "whitelist_del", false );

+		childSetEnabled( LLMediaEntry::WHITELIST_KEY, false );

+		childSetEnabled( LLMediaEntry::WHITELIST_ENABLE_KEY, false );

+	}

+	else

+	{

+		childSetEnabled( "whitelist_del", true );

+		childSetEnabled( LLMediaEntry::WHITELIST_KEY, true );

+		childSetEnabled( LLMediaEntry::WHITELIST_ENABLE_KEY, true );

+	};

+

+	// if nothing is selected, disable DEL button

+	if ( mWhiteListList->getSelectedValue().asString().empty() )

+	{

+		childSetEnabled( "whitelist_del", false );

+	}

+	else

+	{

+		childSetEnabled( "whitelist_del", true );

+	};

+}

+

+////////////////////////////////////////////////////////////////////////////////

+// static 

+void LLPanelMediaSettingsSecurity::initValues( void* userdata, const LLSD& media_settings , bool editable)

+{

+	LLPanelMediaSettingsSecurity *self =(LLPanelMediaSettingsSecurity *)userdata;

+

+	if ( LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo )

+	{

+		if(LLFloaterMediaSettings::getInstance()->mMultipleMedia) 

+		{

+			self->clearValues(self, editable);

+			// only show multiple 

+			return;

+		}

+		

+	}

+	else

+	{

+		if(LLFloaterMediaSettings::getInstance()->mMultipleValidMedia) 

+		{

+			self->clearValues(self, editable);

+			// only show multiple 

+			return;

+		}			

+		

+	}

+	std::string base_key( "" );

+	std::string tentative_key( "" );

+

+	struct 

+	{

+		std::string key_name;

+		LLUICtrl* ctrl_ptr;

+		std::string ctrl_type;

+

+	} data_set [] = 

+	{

+		{ LLMediaEntry::WHITELIST_ENABLE_KEY,	self->mEnableWhiteList,		"LLCheckBoxCtrl" },

+		{ LLMediaEntry::WHITELIST_KEY,			self->mWhiteListList,		"LLScrollListCtrl" },

+		{ "", NULL , "" }

+	};

+

+	for( int i = 0; data_set[ i ].key_name.length() > 0; ++i )

+	{

+		base_key = std::string( data_set[ i ].key_name );

+        tentative_key = base_key + std::string( LLPanelContents::TENTATIVE_SUFFIX );

+

+		// TODO: CP - I bet there is a better way to do this using Boost

+		if ( media_settings[ base_key ].isDefined() )

+		{

+			if ( data_set[ i ].ctrl_type == "LLCheckBoxCtrl" )

+			{

+				static_cast< LLCheckBoxCtrl* >( data_set[ i ].ctrl_ptr )->

+					setValue( media_settings[ base_key ].asBoolean() );

+			}

+			else

+			if ( data_set[ i ].ctrl_type == "LLScrollListCtrl" )

+			{

+				// get control 

+				LLScrollListCtrl* list = static_cast< LLScrollListCtrl* >( data_set[ i ].ctrl_ptr );

+				list->deleteAllItems();

+

+				// points to list of white list URLs

+				LLSD url_list = media_settings[ base_key ];

+

+				// iterate over them and add to scroll list

+				LLSD::array_iterator iter = url_list.beginArray();

+				while( iter != url_list.endArray() )

+				{

+					// TODO: is iter guaranteed to be valid here?

+					std::string url = *iter;

+					list->addSimpleElement( url );

+					++iter;

+				};

+			};

+			data_set[ i ].ctrl_ptr->setEnabled(editable);

+			data_set[ i ].ctrl_ptr->setTentative( media_settings[ tentative_key ].asBoolean() );

+		};

+	};

+}

+

+////////////////////////////////////////////////////////////////////////////////

+// static 

+void LLPanelMediaSettingsSecurity::clearValues( void* userdata , bool editable)

+{

+	LLPanelMediaSettingsSecurity *self =(LLPanelMediaSettingsSecurity *)userdata;

+	self->mEnableWhiteList->clear();

+	self->mWhiteListList->deleteAllItems();

+	self->mEnableWhiteList->setEnabled(editable);

+	self->mWhiteListList->setEnabled(editable);

+}

+////////////////////////////////////////////////////////////////////////////////

+// static

+void LLPanelMediaSettingsSecurity::apply( void* userdata )

+{

+	LLPanelMediaSettingsSecurity *self =(LLPanelMediaSettingsSecurity *)userdata;

+

+	// build LLSD Fragment

+	LLSD media_data_security;

+	self->getValues(media_data_security);

+	// this merges contents of LLSD passed in with what's there so this is ok

+	LLSelectMgr::getInstance()->selectionSetMediaData( media_data_security );

+}

+

+////////////////////////////////////////////////////////////////////////////////

+//

+void LLPanelMediaSettingsSecurity::getValues( LLSD &fill_me_in )

+{

+    fill_me_in[LLMediaEntry::WHITELIST_ENABLE_KEY] = mEnableWhiteList->getValue();

+

+    // iterate over white list and extract items

+    std::vector< LLScrollListItem* > white_list_items = mWhiteListList->getAllData();

+    std::vector< LLScrollListItem* >::iterator iter = white_list_items.begin();

+    fill_me_in[LLMediaEntry::WHITELIST_KEY].clear();

+    while( iter != white_list_items.end() )

+    {

+        std::string white_list_url = (*iter)->getValue().asString();

+        fill_me_in[ LLMediaEntry::WHITELIST_KEY ].append( white_list_url );

+        ++iter;

+    };

+}

+

+///////////////////////////////////////////////////////////////////////////////

+// Try to make a valid URL if a fragment (

+// white list list box widget and build a list to test against. Can also

+const std::string LLPanelMediaSettingsSecurity::makeValidUrl( const std::string& src_url )

+{

+	// make sure the fragment has a scheme

+	const std::string default_scheme( "http://" );

+	if ( src_url.find( default_scheme ) == std::string::npos )

+	{

+		return default_scheme + src_url;

+	};

+

+	// TODO: probably other checks and defaults we can do here.. 

+

+	// this is now a "valid" URL

+	return src_url;

+}

+

+///////////////////////////////////////////////////////////////////////////////

+// wrapper for testing a URL against the whitelist. We grab entries from

+// white list list box widget and build a list to test against. Can also

+// optionally pass the URL that you are trying to add to the widget since

+// it won't be added until this call returns.

+bool LLPanelMediaSettingsSecurity::passesWhiteList( const std::string& added_url,

+													const std::string& test_url )

+{

+	// the checkUrlAgainstWhitelist(..) function works on a vector

+	// of strings for the white list entries - in this panel, the white list

+	// is stored in the widgets themselves so we need to build something compatible.

+	std::vector< std::string > whitelist_strings;

+	whitelist_strings.clear();	// may not be required - I forget what the spec says.

+

+	// step through whitelist widget entries and grab them as strings

+    std::vector< LLScrollListItem* > white_list_items = mWhiteListList->getAllData();

+    std::vector< LLScrollListItem* >::iterator iter = white_list_items.begin(); 

+	while( iter != white_list_items.end()  )

+    {

+        const std::string whitelist_url = (*iter)->getValue().asString();

+		whitelist_strings.push_back( whitelist_url );

+

+		++iter;

+    };

+

+	// add in the URL that might be added to the whitelist so we can test that too

+	if ( added_url.length() )

+		whitelist_strings.push_back( added_url );

+

+	// possible the URL is just a fragment so we validize it

+	const std::string valid_url = makeValidUrl( test_url );

+

+	// indicate if the URL passes whitelist

+	return LLMediaEntry::checkUrlAgainstWhitelist( valid_url, whitelist_strings );

+}

+

+///////////////////////////////////////////////////////////////////////////////

+//

+void LLPanelMediaSettingsSecurity::addWhiteListItem(const std::string& url)

+{

+	// grab home URL from the general panel (via the parent floater)

+	std::string home_url( "" );

+	if ( mParent )

+		home_url = mParent->getHomeUrl();

+

+	// if the home URL is blank (user hasn't entered it yet) then

+	// don't bother to check if it passes the white list

+	if ( home_url.empty() )

+	{

+		mWhiteListList->addSimpleElement( url );

+		return;

+	};

+

+	// if the URL passes the white list, add it

+	if ( passesWhiteList( url, home_url ) )

+	{

+		mWhiteListList->addSimpleElement( url );

+	}

+	else

+	// display a message indicating you can't do that

+	{

+		LLNotifications::instance().add("WhiteListInvalidatesHomeUrl");

+	};

+}

+

+///////////////////////////////////////////////////////////////////////////////

+// static

+void LLPanelMediaSettingsSecurity::onBtnAdd( void* userdata )

+{

+	LLFloaterReg::showInstance("whitelist_entry");

+}

+

+///////////////////////////////////////////////////////////////////////////////

+// static

+void LLPanelMediaSettingsSecurity::onBtnDel( void* userdata )

+{

+	LLPanelMediaSettingsSecurity *self =(LLPanelMediaSettingsSecurity *)userdata;

+

+	self->mWhiteListList->deleteSelectedItems();

+}

+

 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLPanelMediaSettingsSecurity::getValues( LLSD &fill_me_in )
-{
-    fill_me_in[LLMediaEntry::WHITELIST_ENABLE_KEY] = mEnableWhiteList->getValue();
-
-    // iterate over white list and extract items
-    std::vector< LLScrollListItem* > white_list_items = mWhiteListList->getAllData();
-    std::vector< LLScrollListItem* >::iterator iter = white_list_items.begin();
-    fill_me_in[LLMediaEntry::WHITELIST_KEY].clear();
-    while( iter != white_list_items.end() )
-    {
-        std::string white_list_url = (*iter)->getValue().asString();
-        fill_me_in[ LLMediaEntry::WHITELIST_KEY ].append( white_list_url );
-        ++iter;
-    };
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-// static
-void LLPanelMediaSettingsSecurity::addWhiteListItem(const std::string& url)
-{
-	mWhiteListList->addSimpleElement( url );
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// static
-void LLPanelMediaSettingsSecurity::onBtnAdd( void* userdata )
-{
-	LLFloaterReg::showInstance("whitelist_entry");
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// static
-void LLPanelMediaSettingsSecurity::onBtnDel( void* userdata )
+void LLPanelMediaSettingsSecurity::setParent( LLFloaterMediaSettings* parent )
 {
-	LLPanelMediaSettingsSecurity *self =(LLPanelMediaSettingsSecurity *)userdata;
+	mParent = parent;
+};
 
-	self->mWhiteListList->deleteSelectedItems();
-}
diff --git a/indra/newview/llpanelmediasettingssecurity.h b/indra/newview/llpanelmediasettingssecurity.h
index b7cf67c039..b78ee92193 100644
--- a/indra/newview/llpanelmediasettingssecurity.h
+++ b/indra/newview/llpanelmediasettingssecurity.h
@@ -37,6 +37,7 @@
 
 class LLCheckBoxCtrl;
 class LLScrollListCtrl;
+class LLFloaterMediaSettings;
 
 class LLPanelMediaSettingsSecurity : public LLPanel
 {
@@ -52,6 +53,12 @@ class LLPanelMediaSettingsSecurity : public LLPanel
 		static void initValues( void* userdata, const LLSD& media_settings,bool editable );
 		static void clearValues( void* userdata, bool editable);
 		void addWhiteListItem(const std::string& url);
+		void setParent( LLFloaterMediaSettings* parent );
+		const std::string makeValidUrl( const std::string& src_url );
+		bool passesWhiteList( const std::string& added_url, const std::string& test_url );

+
+	protected:
+		LLFloaterMediaSettings* mParent;
 
 	private:
 		LLCheckBoxCtrl* mEnableWhiteList;
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f141a909a8..4c90d9ee8a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -661,6 +661,19 @@ To place the media on only one face, choose Select Texture and click on the desi
 
   <notification
    icon="alertmodal.tga"
+   name="WhiteListInvalidatesHomeUrl"
+   type="alertmodal">
+Adding this entry to the whitelist will invalidate the home URL you
+specified for this instance of media. You are not allowed to do this
+so the entry cannot be added to the whitelist.
+    <usetemplate
+     name="okbutton"
+     yestext="Ok"/>
+  </notification>
+
+
+  <notification
+   icon="alertmodal.tga"
    name="MustBeInParcel"
    type="alertmodal">
 You must be standing inside the land parcel to set its Landing Point.