Merge, pulling in viewer-2-0

1 files changed, 3 insertions, 3 deletions

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