Simple fix for DEV-44111 ( whitelist appears disabled if first whitelist entry fails)

3 files changed, 5 insertions, 7 deletions

diff --git a/indra/newview/llfloaterwhitelistentry.cpp b/indra/newview/llfloaterwhitelistentry.cpp
index 04dbd38153..705c8afd00 100644
--- a/indra/newview/llfloaterwhitelistentry.cpp
+++ b/indra/newview/llfloaterwhitelistentry.cpp
@@ -82,6 +82,7 @@ void LLFloaterWhiteListEntry::onBtnOK( void* userdata )
 		std::string white_list_item = self->mWhiteListEdit->getText();
 
 		panel->addWhiteListEntry( white_list_item );
+		panel->updateWhitelistEnableStatus();
 	};
 	
 	self->closeFloater();	
diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp
index aea6b0aa3b..81842e3851 100644
--- a/indra/newview/llpanelmediasettingssecurity.cpp
+++ b/indra/newview/llpanelmediasettingssecurity.cpp
@@ -323,7 +323,7 @@ void LLPanelMediaSettingsSecurity::addWhiteListEntry( const std::string& entry )
 	else
 	{
 		row[ "columns" ][ ICON_COLUMN ][ "type" ] = "icon";
-		row[ "columns" ][ ICON_COLUMN ][ "value" ] = "parcel_color_EXP";
+		row[ "columns" ][ ICON_COLUMN ][ "value" ] = "Parcel_Exp_Color";
 		row[ "columns" ][ ICON_COLUMN ][ "width" ] = 20;
 	};
 
@@ -333,9 +333,6 @@ void LLPanelMediaSettingsSecurity::addWhiteListEntry( const std::string& entry )
 
 	// add to the white list scroll box
 	mWhiteListList->addElement( row );
-
-	// update whitelist enable checkbox based on whether the home url passes the whitelist
-	updateWhitelistEnableStatus();
 };
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelmediasettingssecurity.h b/indra/newview/llpanelmediasettingssecurity.h
index 937bfb1bf9..66ccb23f46 100644
--- a/indra/newview/llpanelmediasettingssecurity.h
+++ b/indra/newview/llpanelmediasettingssecurity.h
@@ -63,7 +63,9 @@ public:
 	void setParent( LLFloaterMediaSettings* parent );
 	bool urlPassesWhiteList( const std::string& test_url );
 	const std::string makeValidUrl( const std::string& src_url );
-	
+
+	void updateWhitelistEnableStatus();	
+
 protected:
 	LLFloaterMediaSettings* mParent;
 	
@@ -78,8 +80,6 @@ private:
 	LLScrollListCtrl* mWhiteListList;
 	LLTextBox* mHomeUrlFailsWhiteListText;
 
-	void updateWhitelistEnableStatus();
-
 	static void onBtnAdd(void*);
 	static void onBtnDel(void*);
 };