Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 68 insertions, 68 deletions

diff --git a/indra/llcommon/llalignedarray.h b/indra/llcommon/llalignedarray.h
index da9d98c16c..0ba8b34cb6 100644
--- a/indra/llcommon/llalignedarray.h
+++ b/indra/llcommon/llalignedarray.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llalignedarray.h
  * @brief A static array which obeys alignment restrictions and mimics std::vector accessors.
  *
  * $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$
  */
@@ -33,94 +33,94 @@ template <class T, U32 alignment>
 class LLAlignedArray
 {
 public:
-	T* mArray;
-	U32 mElementCount;
-	U32 mCapacity;
-
-	LLAlignedArray();
-	~LLAlignedArray();
-
-	void push_back(const T& elem);
-	U32 size() const { return mElementCount; }
-	void resize(U32 size);
-	T* append(S32 N);
-	T& operator[](int idx);
-	const T& operator[](int idx) const;
+    T* mArray;
+    U32 mElementCount;
+    U32 mCapacity;
+
+    LLAlignedArray();
+    ~LLAlignedArray();
+
+    void push_back(const T& elem);
+    U32 size() const { return mElementCount; }
+    void resize(U32 size);
+    T* append(S32 N);
+    T& operator[](int idx);
+    const T& operator[](int idx) const;
 };
 
 template <class T, U32 alignment>
 LLAlignedArray<T, alignment>::LLAlignedArray()
 {
-	llassert(alignment >= 16);
-	mArray = NULL;
-	mElementCount = 0;
-	mCapacity = 0;
+    llassert(alignment >= 16);
+    mArray = NULL;
+    mElementCount = 0;
+    mCapacity = 0;
 }
 
 template <class T, U32 alignment>
 LLAlignedArray<T, alignment>::~LLAlignedArray()
 {
-	ll_aligned_free<alignment>(mArray);
-	mArray = NULL;
-	mElementCount = 0;
-	mCapacity = 0;
+    ll_aligned_free<alignment>(mArray);
+    mArray = NULL;
+    mElementCount = 0;
+    mCapacity = 0;
 }
 
 template <class T, U32 alignment>
 void LLAlignedArray<T, alignment>::push_back(const T& elem)
 {
-	T* old_buf = NULL;
-	if (mCapacity <= mElementCount)
-	{
-		mCapacity++;
-		mCapacity *= 2;
-		T* new_buf = (T*) ll_aligned_malloc<alignment>(mCapacity*sizeof(T));
-		if (mArray)
-		{
-			ll_memcpy_nonaliased_aligned_16((char*)new_buf, (char*)mArray, sizeof(T)*mElementCount);
-		}
-		old_buf = mArray;
-		mArray = new_buf;
-	}
-
-	mArray[mElementCount++] = elem;
-
-	//delete old array here to prevent error on a.push_back(a[0])
-	ll_aligned_free<alignment>(old_buf);
+    T* old_buf = NULL;
+    if (mCapacity <= mElementCount)
+    {
+        mCapacity++;
+        mCapacity *= 2;
+        T* new_buf = (T*) ll_aligned_malloc<alignment>(mCapacity*sizeof(T));
+        if (mArray)
+        {
+            ll_memcpy_nonaliased_aligned_16((char*)new_buf, (char*)mArray, sizeof(T)*mElementCount);
+        }
+        old_buf = mArray;
+        mArray = new_buf;
+    }
+
+    mArray[mElementCount++] = elem;
+
+    //delete old array here to prevent error on a.push_back(a[0])
+    ll_aligned_free<alignment>(old_buf);
 }
 
 template <class T, U32 alignment>
 void LLAlignedArray<T, alignment>::resize(U32 size)
 {
-	if (mCapacity < size)
-	{
-		mCapacity = size+mCapacity*2;
-		T* new_buf = mCapacity > 0 ? (T*) ll_aligned_malloc<alignment>(mCapacity*sizeof(T)) : NULL;
-		if (mArray)
-		{
-			ll_memcpy_nonaliased_aligned_16((char*) new_buf, (char*) mArray, sizeof(T)*mElementCount);
-			ll_aligned_free<alignment>(mArray);
-		}
-
-		/*for (U32 i = mElementCount; i < mCapacity; ++i)
-		{
-			new(new_buf+i) T();
-		}*/
-		mArray = new_buf;
-	}
-
-	mElementCount = size;
+    if (mCapacity < size)
+    {
+        mCapacity = size+mCapacity*2;
+        T* new_buf = mCapacity > 0 ? (T*) ll_aligned_malloc<alignment>(mCapacity*sizeof(T)) : NULL;
+        if (mArray)
+        {
+            ll_memcpy_nonaliased_aligned_16((char*) new_buf, (char*) mArray, sizeof(T)*mElementCount);
+            ll_aligned_free<alignment>(mArray);
+        }
+
+        /*for (U32 i = mElementCount; i < mCapacity; ++i)
+        {
+            new(new_buf+i) T();
+        }*/
+        mArray = new_buf;
+    }
+
+    mElementCount = size;
 }
 
 
 template <class T, U32 alignment>
 T& LLAlignedArray<T, alignment>::operator[](int idx)
 {
-	if(idx >= mElementCount || idx < 0)
+    if(idx >= mElementCount || idx < 0)
     {
         LL_ERRS() << "Out of bounds LLAlignedArray, requested: " << (S32)idx << " size: " << mElementCount << LL_ENDL;
     }
-	return mArray[idx];
+    return mArray[idx];
 }
 
 template <class T, U32 alignment>
@@ -130,15 +130,15 @@ const T& LLAlignedArray<T, alignment>::operator[](int idx) const
     {
         LL_ERRS() << "Out of bounds LLAlignedArray, requested: " << (S32)idx << " size: " << mElementCount << LL_ENDL;
     }
-	return mArray[idx];
+    return mArray[idx];
 }
 
 template <class T, U32 alignment>
 T* LLAlignedArray<T, alignment>::append(S32 N)
 {
-	U32 sz = size();
-	resize(sz+N);
-	return &((*this)[sz]);
+    U32 sz = size();
+    resize(sz+N);
+    return &((*this)[sz]);
 }
 
 #endif