Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev

merge maint-a (including maint-x) into gltf_development

1 files changed, 16 insertions, 16 deletions

diff --git a/indra/llcommon/llmemorystream.h b/indra/llcommon/llmemorystream.h
index e28f012192..6024bc5d37 100644
--- a/indra/llcommon/llmemorystream.h
+++ b/indra/llcommon/llmemorystream.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llmemorystream.h
  * @author Phoenix
  * @date 2005-06-03
@@ -7,21 +7,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$
  */
@@ -29,7 +29,7 @@
 #ifndef LL_LLMEMORYSTREAM_H
 #define LL_LLMEMORYSTREAM_H
 
-/** 
+/**
  * This is a simple but effective optimization when you want to treat
  * a chunk of memory as an istream. I wrote this to avoid turing a
  * buffer into a string, and then throwing the string into an
@@ -38,7 +38,7 @@
 
 #include <iostream>
 
-/** 
+/**
  * @class LLMemoryStreamBuf
  * @brief This implements a wrapper around a piece of memory for istreams
  *
@@ -49,18 +49,18 @@
 class LL_COMMON_API LLMemoryStreamBuf : public std::streambuf
 {
 public:
-	LLMemoryStreamBuf(const U8* start, S32 length);
-	~LLMemoryStreamBuf();
+    LLMemoryStreamBuf(const U8* start, S32 length);
+    ~LLMemoryStreamBuf();
 
-	void reset(const U8* start, S32 length);
+    void reset(const U8* start, S32 length);
 
 protected:
-	int underflow();
-	//std::streamsize xsgetn(char* dest, std::streamsize n);
+    int underflow();
+    //std::streamsize xsgetn(char* dest, std::streamsize n);
 };
 
 
-/** 
+/**
  * @class LLMemoryStream
  * @brief This implements a wrapper around a piece of memory for istreams
  *
@@ -71,11 +71,11 @@ protected:
 class LL_COMMON_API LLMemoryStream : public std::istream
 {
 public:
-	LLMemoryStream(const U8* start, S32 length);
-	~LLMemoryStream();
+    LLMemoryStream(const U8* start, S32 length);
+    ~LLMemoryStream();
 
 protected:
-	LLMemoryStreamBuf mStreamBuf;
+    LLMemoryStreamBuf mStreamBuf;
 };
 
 #endif // LL_LLMEMORYSTREAM_H