diff options
author | Brad Kittenbrink <brad@lindenlab.com> | 2007-05-23 21:17:34 +0000 |
---|---|---|
committer | Brad Kittenbrink <brad@lindenlab.com> | 2007-05-23 21:17:34 +0000 |
commit | 029130bf9c76139fa836117987b60e801ac7ec7c (patch) | |
tree | ee320f7737ad3edc74a2401b5bd20a027b670487 /indra/llcommon/llbase32.cpp | |
parent | 0aac2f674e4bd2fc73025ec8b649739cf7be3e4c (diff) |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
Diffstat (limited to 'indra/llcommon/llbase32.cpp')
-rw-r--r-- | indra/llcommon/llbase32.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/llcommon/llbase32.cpp b/indra/llcommon/llbase32.cpp index 711ba63ea2..96e4d76f3b 100644 --- a/indra/llcommon/llbase32.cpp +++ b/indra/llcommon/llbase32.cpp @@ -6,6 +6,12 @@ * Based on code from bitter * http://ghostwhitecrab.com/bitter/ * + * Some parts of this file are: + * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc. + * $License$ + */ + +/** * Copyright (c) 2006 Christian Biere <christianbiere@gmx.de> * All rights reserved. * @@ -192,6 +198,8 @@ base32_decode(char *dst, size_t size, const void *data, size_t len) */ +// The following is +// Copyright (c) 2007-$CurrentYear$, Linden Research, Inc. // static std::string LLBase32::encode(const U8* input, size_t input_size) { @@ -207,8 +215,8 @@ std::string LLBase32::encode(const U8* input, size_t input_size) size_t encoded = base32_encode(&output[0], output_size, input, input_size); - llinfos << "encoded " << encoded << " into buffer of size " << output_size - << llendl; + llinfos << "encoded " << encoded << " into buffer of size " + << output_size << llendl; } return output; } |