From 25c10ed028da5c547b11f1f461916897272b0e6d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 26 Jun 2008 00:39:00 +0000 Subject: QAR-628 merge string-cleanup-5 -r 90476:90508 -> release dataserver-is-deprecated --- indra/newview/llurlwhitelist.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/llurlwhitelist.h') 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; }; -- cgit v1.2.3