merge from remote repo

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp
index 33f0952f53..3577f63340 100644
--- a/indra/newview/llpanelmediasettingssecurity.cpp
+++ b/indra/newview/llpanelmediasettingssecurity.cpp
@@ -235,17 +235,17 @@ void LLPanelMediaSettingsSecurity::getValues( LLSD &fill_me_in )
 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 +332,10 @@ void LLPanelMediaSettingsSecurity::onBtnDel( void* userdata )
 	self->mWhiteListList->deleteSelectedItems();

 }

 

-////////////////////////////////////////////////////////////////////////////////

-//

-void LLPanelMediaSettingsSecurity::setParent( LLFloaterMediaSettings* parent )

-{

-	mParent = parent;

-};

-

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