1 files changed, 9 insertions, 15 deletions

diff --git a/linden/indra/newview/llurlwhitelist.cpp b/linden/indra/newview/llurlwhitelist.cpp
index 8992146..3a8c952 100644
--- a/linden/indra/newview/llurlwhitelist.cpp
+++ b/linden/indra/newview/llurlwhitelist.cpp
@@ -40,7 +40,7 @@ LLUrlWhiteList::LLUrlWhiteList () :
         mLoaded ( false ),
         mFilename ( "url_whitelist.ini" ),
         mUrlList ( 0 ),
-        mUrlListIter ( 0 )
+        mCurIndex ( 0 )
 {
 }
 
@@ -121,10 +121,10 @@ bool LLUrlWhiteList::save ()
         if ( file.is_open () )
         {
                 // for each entry we have
-                for ( LLStringListIter iter = mUrlList.begin (); iter != mUrlList.end (); ++iter )
+                for ( string_list_t::iterator iter = mUrlList.begin (); iter != mUrlList.end (); ++iter )
                 {
                         file << ( *iter ) << std::endl;
-                };
+                }
 
                 file.close ();
 
@@ -140,8 +140,7 @@ bool LLUrlWhiteList::clear ()
 {
         mUrlList.clear ();
 
-        // invalidate iterator since we changed the contents 
-        mUrlListIter = mUrlList.end ();
+        mCurIndex = 0;
 
         return true;
 }
@@ -175,7 +174,7 @@ bool LLUrlWhiteList::addItem ( const LLString& itemIn, bool saveAfterAdd )
 {
         LLString item = url_cleanup(itemIn);
         
-        mUrlList.insert ( mUrlList.end (), item );
+        mUrlList.push_back ( item );
 
         // use this when all you want to do is call addItem ( ... ) where necessary
         if ( saveAfterAdd )
@@ -191,11 +190,8 @@ bool LLUrlWhiteList::getFirst ( LLString& valueOut )
         if ( mUrlList.size () == 0 )
                 return false;
 
-        mUrlListIter = mUrlList.begin ();
-
-        valueOut = * ( mUrlListIter );
-
-        ++mUrlListIter;
+        mCurIndex = 0;
+        valueOut = mUrlList[mCurIndex++];
 
         return true;    
 }
@@ -204,12 +200,10 @@ bool LLUrlWhiteList::getFirst ( LLString& valueOut )
 //
 bool LLUrlWhiteList::getNext ( LLString& valueOut )
 {
-        if ( mUrlListIter == mUrlList.end () )
+        if ( mCurIndex >= mUrlList.size () )
                 return false;
 
-        valueOut = * ( mUrlListIter );
-
-        ++mUrlListIter;
+        valueOut = mUrlList[mCurIndex++];
 
         return true;
 }