diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 23:19:43 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 23:19:43 +0000 |
| commit | 5595a996234cbe610f9681dbe8ed26880decd94a (patch) | |
| tree | 7e2e8790ec131ea698533f0682415cf70504fd89 /indra/llmessage/message.cpp | |
| parent | 4942a7b77917f9a163453ecdd040993965672cc0 (diff) | |
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
Diffstat (limited to 'indra/llmessage/message.cpp')
| -rw-r--r-- | indra/llmessage/message.cpp | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 7f9f440c80..e2cd19b264 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -2,8 +2,31 @@ * @file message.cpp * @brief LLMessageSystem class implementation * - * Copyright (c) 2001-$CurrentYear$, Linden Research, Inc. - * $License$ + * $LicenseInfo:firstyear=2001&license=viewergpl$ + * + * Copyright (c) 2001-2007, Linden Research, Inc. + * + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlife.com/developers/opensource/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlife.com/developers/opensource/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. + * $/LicenseInfo$ */ #include "linden_common.h" @@ -2381,8 +2404,8 @@ void dump_prehash_files() " * @file message_prehash.h\n" " * @brief header file of externs of prehashed variables plus defines.\n" " *\n" - " * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.\n" - " * $License$\n" + " * $LicenseInfo:firstyear=2003&license=viewergpl$" + " * $/LicenseInfo$" " */\n\n" "#ifndef LL_MESSAGE_PREHASH_H\n#define LL_MESSAGE_PREHASH_H\n\n"); fprintf( @@ -2413,8 +2436,8 @@ void dump_prehash_files() " * @file message_prehash.cpp\n" " * @brief file of prehashed variables\n" " *\n" - " * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.\n" - " * $License$\n" + " * $LicenseInfo:firstyear=2003&license=viewergpl$" + " * $/LicenseInfo$" " */\n\n" "/**\n" " * Generated from message template version number %.3f\n" |