From 3831ca912eb8b78ccdcfac7d37c015ca45351c83 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 15 Oct 2009 11:29:14 -0700
Subject: 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.

---
 indra/newview/llfloatermediasettings.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'indra/newview/llfloatermediasettings.cpp')

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;
+}
-- 
cgit v1.2.3