Merge pull request #1545 from Ansariel/DRTVWR-600-maint-A

Merge main into DRTVWR-600-maint-a

1 files changed, 21 insertions, 21 deletions

diff --git a/indra/newview/llurlwhitelist.h b/indra/newview/llurlwhitelist.h
index c2511b08fd..8326c1057f 100644
--- a/indra/newview/llurlwhitelist.h
+++ b/indra/newview/llurlwhitelist.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llurlwhitelist.h
  * @author Callum Prentice
  * @brief maintains a "white list" of acceptable URLS that are stored on disk
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2005&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -32,27 +32,27 @@
 
 class LLUrlWhiteList : public LLSingleton<LLUrlWhiteList>
 {
-	LLSINGLETON(LLUrlWhiteList);
-	~LLUrlWhiteList();
-	public:
-		bool load ();
-		bool save ();
+    LLSINGLETON(LLUrlWhiteList);
+    ~LLUrlWhiteList();
+    public:
+        bool load ();
+        bool save ();
 
-		bool clear ();
-		bool addItem ( const std::string& itemIn, bool saveAfterAdd );
+        bool clear ();
+        bool addItem ( const std::string& itemIn, bool saveAfterAdd );
 
-		bool containsMatch ( const std::string& patternIn );
+        bool containsMatch ( const std::string& patternIn );
 
-		bool getFirst ( std::string& valueOut );
-		bool getNext ( std::string& valueOut );
+        bool getFirst ( std::string& valueOut );
+        bool getNext ( std::string& valueOut );
 
-	private:
-		typedef std::vector < std::string > string_list_t ;
+    private:
+        typedef std::vector < std::string > string_list_t ;
 
-		bool mLoaded;
-		const std::string mFilename;
-		string_list_t mUrlList;
-		U32 mCurIndex;
+        bool mLoaded;
+        const std::string mFilename;
+        string_list_t mUrlList;
+        U32 mCurIndex;
 };
 
 #endif  // LL_LLURLWHITELIST_H