FIX DEV-42093 - Make sure to navigate home if current URL is empty on "Apply"

This change gets rid of the crufty (and confusing) "apply()"
functions from llpanelmediasettings*.  Those functions were
never being called, yet changes were being made in them.

Instead, I added "preApply()" and "postApply()" to each of
these panels, which the floater (who really does the "apply()"ing)
now calls before and after it applies the changes to the
media data.

1 files changed, 27 insertions, 25 deletions

diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp
index 3577f63340..611293f3e2 100644
--- a/indra/newview/llpanelmediasettingssecurity.cpp
+++ b/indra/newview/llpanelmediasettingssecurity.cpp
@@ -198,17 +198,12 @@ void LLPanelMediaSettingsSecurity::clearValues( void* userdata , bool editable)
 	self->mEnableWhiteList->setEnabled(editable);

 	self->mWhiteListList->setEnabled(editable);

 }

+

 ////////////////////////////////////////////////////////////////////////////////

-// static

-void LLPanelMediaSettingsSecurity::apply( void* userdata )

+// 

+void LLPanelMediaSettingsSecurity::preApply()

 {

-	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 );

+	// no-op

 }

 

 ////////////////////////////////////////////////////////////////////////////////

@@ -220,7 +215,7 @@ void LLPanelMediaSettingsSecurity::getValues( LLSD &fill_me_in )
     // 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();

+    fill_me_in.erase(LLMediaEntry::WHITELIST_KEY);

     while( iter != white_list_items.end() )

     {

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

@@ -229,23 +224,30 @@ void LLPanelMediaSettingsSecurity::getValues( LLSD &fill_me_in )
     };

 }

 

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

+// 

+void LLPanelMediaSettingsSecurity::postApply()

+{

+	// no-op

+}

+

 ///////////////////////////////////////////////////////////////////////////////

 // 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 )

 {

 	// use LLURI to determine if we have a valid scheme

-	LLURI candidate_url( src_url );
-	if ( candidate_url.scheme().empty() )
-	{
+	LLURI candidate_url( src_url );

+	if ( candidate_url.scheme().empty() )

+	{

 		// build a URL comprised of default scheme and the original fragment 

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

 		return default_scheme + src_url;

-	};
-
-	// we *could* test the "default scheme" + "original fragment" URL again
-	// using LLURI to see if it's valid but I think the outcome is the same
-	// in either case - our only option is to return the original URL
+	};

+

+	// we *could* test the "default scheme" + "original fragment" URL again

+	// using LLURI to see if it's valid but I think the outcome is the same

+	// in either case - our only option is to return the original URL

 

 	// we *think* the original url passed in was valid

 	return src_url;

@@ -332,10 +334,10 @@ void LLPanelMediaSettingsSecurity::onBtnDel( void* userdata )
 	self->mWhiteListList->deleteSelectedItems();

 }

 

-////////////////////////////////////////////////////////////////////////////////
-//
-void LLPanelMediaSettingsSecurity::setParent( LLFloaterMediaSettings* parent )
-{
-	mParent = parent;
-};
-
+////////////////////////////////////////////////////////////////////////////////

+//

+void LLPanelMediaSettingsSecurity::setParent( LLFloaterMediaSettings* parent )

+{

+	mParent = parent;

+};

+