Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/llmessage/llnullcipher.h b/indra/llmessage/llnullcipher.h
index a9f9a1ce03..8b397d46cf 100644
--- a/indra/llmessage/llnullcipher.h
+++ b/indra/llmessage/llnullcipher.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llnullcipher.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$
  */
@@ -38,11 +38,11 @@
 class LLNullCipher : public LLCipher
 {
 public:
-	LLNullCipher() {}
-	virtual ~LLNullCipher() {}
-	virtual U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-	virtual U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
-	virtual U32 requiredEncryptionSpace(U32 src_len) const;
+    LLNullCipher() {}
+    virtual ~LLNullCipher() {}
+    virtual U32 encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+    virtual U32 decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len);
+    virtual U32 requiredEncryptionSpace(U32 src_len) const;
 };
 
 #endif