Merge commit 'e7eced3' into nat/releaseos for whitespace fix.

1 files changed, 26 insertions, 26 deletions

diff --git a/indra/newview/llvlmanager.h b/indra/newview/llvlmanager.h
index 5e7fadc522..2b2535d226 100644
--- a/indra/newview/llvlmanager.h
+++ b/indra/newview/llvlmanager.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llvlmanager.h
  * @brief LLVLManager class definition
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -37,40 +37,40 @@ class LLViewerRegion;
 class LLVLManager
 {
 public:
-	~LLVLManager();
+    ~LLVLManager();
 
-	void addLayerData(LLVLData *vl_datap, const S32Bytes mesg_size);
+    void addLayerData(LLVLData *vl_datap, const S32Bytes mesg_size);
 
-	void unpackData(const S32 num_packets = 10);
+    void unpackData(const S32 num_packets = 10);
 
-	S32Bytes getTotalBytes() const;
+    S32Bytes getTotalBytes() const;
 
-	U32Bits getLandBits() const;
-	U32Bits getWindBits() const;
-	U32Bits getCloudBits() const;
+    U32Bits getLandBits() const;
+    U32Bits getWindBits() const;
+    U32Bits getCloudBits() const;
 
-	void resetBitCounts();
+    void resetBitCounts();
 
-	void cleanupData(LLViewerRegion *regionp);
+    void cleanupData(LLViewerRegion *regionp);
 protected:
 
-	std::vector<LLVLData *> mPacketData;
-	U32Bits mLandBits;
-	U32Bits mWindBits;
-	U32Bits mCloudBits;
+    std::vector<LLVLData *> mPacketData;
+    U32Bits mLandBits;
+    U32Bits mWindBits;
+    U32Bits mCloudBits;
 };
 
 class LLVLData
 {
 public:
-	LLVLData(LLViewerRegion *regionp,
-			 const S8 type, U8 *data, const S32 size);
-	~LLVLData();
-
-	S8 mType;
-	U8 *mData;
-	S32 mSize;
-	LLViewerRegion *mRegionp;
+    LLVLData(LLViewerRegion *regionp,
+             const S8 type, U8 *data, const S32 size);
+    ~LLVLData();
+
+    S8 mType;
+    U8 *mData;
+    S32 mSize;
+    LLViewerRegion *mRegionp;
 };
 
 extern LLVLManager gVLManager;