QAR-628 merge string-cleanup-5 -r 90476:90508 -> release

dataserver-is-deprecated

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/llurlwhitelist.h b/indra/newview/llurlwhitelist.h
index b9901b68c2..eab63cb542 100644
--- a/indra/newview/llurlwhitelist.h
+++ b/indra/newview/llurlwhitelist.h
@@ -48,21 +48,21 @@ class LLUrlWhiteList
 		bool save ();
 
 		bool clear ();
-		bool addItem ( const LLString& itemIn, bool saveAfterAdd );
+		bool addItem ( const std::string& itemIn, bool saveAfterAdd );
 
-		bool containsMatch ( const LLString& patternIn );
+		bool containsMatch ( const std::string& patternIn );
 
-		bool getFirst ( LLString& valueOut );
-		bool getNext ( LLString& valueOut );
+		bool getFirst ( std::string& valueOut );
+		bool getNext ( std::string& valueOut );
 
 	private:
 		LLUrlWhiteList ();
 		static LLUrlWhiteList* sInstance;
 
-		typedef std::vector < LLString > string_list_t ;
+		typedef std::vector < std::string > string_list_t ;
 
 		bool mLoaded;
-		const LLString mFilename;
+		const std::string mFilename;
 		string_list_t mUrlList;
 		U32 mCurIndex;
 };