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

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

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/llmessage/llxorcipher.h b/indra/llmessage/llxorcipher.h
index cd1fed3ba4..50ea997b4d 100644
--- a/indra/llmessage/llxorcipher.h
+++ b/indra/llmessage/llxorcipher.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llxorcipher.h
  *
  * $LicenseInfo:firstyear=2003&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,31 +37,31 @@
 class LLXORCipher : public LLCipher
 {
 public:
-	LLXORCipher(const U8* pad, U32 pad_len);
-	LLXORCipher(const LLXORCipher& cipher);
-	virtual ~LLXORCipher();
-	LLXORCipher& operator=(const LLXORCipher& cipher);
+    LLXORCipher(const U8* pad, U32 pad_len);
+    LLXORCipher(const LLXORCipher& cipher);
+    virtual ~LLXORCipher();
+    LLXORCipher& operator=(const LLXORCipher& cipher);
 
-	// Cipher functions
-	U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) override;
-	U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) override;
-	U32 requiredEncryptionSpace(U32 src_len) const override;
+    // Cipher functions
+    U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) override;
+    U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len) override;
+    U32 requiredEncryptionSpace(U32 src_len) const override;
 
-	// special syntactic-sugar since xor can be performed in place.
-	bool encrypt(U8* buf, U32 len) { return encrypt((const U8*)buf, len, buf, len) > 0; }
-	bool decrypt(U8* buf, U32 len) { return decrypt((const U8*)buf, len, buf, len) > 0; }
+    // special syntactic-sugar since xor can be performed in place.
+    bool encrypt(U8* buf, U32 len) { return encrypt((const U8*)buf, len, buf, len) > 0; }
+    bool decrypt(U8* buf, U32 len) { return decrypt((const U8*)buf, len, buf, len) > 0; }
 
 #ifdef _DEBUG
-	// This function runs tests to make sure the crc is
-	// working. Returns true if it is.
-	static bool testHarness();
+    // This function runs tests to make sure the crc is
+    // working. Returns true if it is.
+    static bool testHarness();
 #endif
 
 protected:
-	void init(const U8* pad, U32 pad_len);
-	U8* mPad;
-	U8* mHead;
-	U32 mPadLen;
+    void init(const U8* pad, U32 pad_len);
+    U8* mPad;
+    U8* mHead;
+    U32 mPadLen;
 };
 
 #endif