Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X

1 files changed, 29 insertions, 29 deletions

diff --git a/indra/llfilesystem/lldirguard.h b/indra/llfilesystem/lldirguard.h
index 37b9e9b83e..fcb179bbc8 100644
--- a/indra/llfilesystem/lldirguard.h
+++ b/indra/llfilesystem/lldirguard.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldirguard.h
  * @brief Protect working directory from being changed in scope.
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -34,39 +34,39 @@
 class LLDirectoryGuard
 {
 public:
-	LLDirectoryGuard()
-	{
-		mOrigDirLen = GetCurrentDirectory(MAX_PATH, mOrigDir);
-	}
+    LLDirectoryGuard()
+    {
+        mOrigDirLen = GetCurrentDirectory(MAX_PATH, mOrigDir);
+    }
 
-	~LLDirectoryGuard()
-	{
-		mFinalDirLen = GetCurrentDirectory(MAX_PATH, mFinalDir);
-		if ((mOrigDirLen!=mFinalDirLen) ||
-			(wcsncmp(mOrigDir,mFinalDir,mOrigDirLen)!=0))
-		{
-			// Dir has changed
-			std::string mOrigDirUtf8 = utf16str_to_utf8str(llutf16string(mOrigDir));
-			std::string mFinalDirUtf8 = utf16str_to_utf8str(llutf16string(mFinalDir));
-			LL_INFOS() << "Resetting working dir from " << mFinalDirUtf8 << " to " << mOrigDirUtf8 << LL_ENDL;
-			SetCurrentDirectory(mOrigDir);
-		}
-	}
+    ~LLDirectoryGuard()
+    {
+        mFinalDirLen = GetCurrentDirectory(MAX_PATH, mFinalDir);
+        if ((mOrigDirLen!=mFinalDirLen) ||
+            (wcsncmp(mOrigDir,mFinalDir,mOrigDirLen)!=0))
+        {
+            // Dir has changed
+            std::string mOrigDirUtf8 = utf16str_to_utf8str(llutf16string(mOrigDir));
+            std::string mFinalDirUtf8 = utf16str_to_utf8str(llutf16string(mFinalDir));
+            LL_INFOS() << "Resetting working dir from " << mFinalDirUtf8 << " to " << mOrigDirUtf8 << LL_ENDL;
+            SetCurrentDirectory(mOrigDir);
+        }
+    }
 
 private:
-	TCHAR mOrigDir[MAX_PATH];
-	DWORD mOrigDirLen;
-	TCHAR mFinalDir[MAX_PATH];
-	DWORD mFinalDirLen;
+    TCHAR mOrigDir[MAX_PATH];
+    DWORD mOrigDirLen;
+    TCHAR mFinalDir[MAX_PATH];
+    DWORD mFinalDirLen;
 };
 #else // No-op outside Windows.
 class LLDirectoryGuard
 {
 public:
-	LLDirectoryGuard() {}
-	~LLDirectoryGuard() {}
+    LLDirectoryGuard() {}
+    ~LLDirectoryGuard() {}
 };
-#endif 
+#endif
 
 
 #endif