summaryrefslogtreecommitdiff
path: root/indra/llprimitive/tests/llprimitive_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-13 07:24:37 -0400
committerOz Linden <oz@lindenlab.com>2010-10-13 07:24:37 -0400
commita5619d16f74863168f45b04b37cc6383e1a92263 (patch)
treebabc9b62e24e743968d4d620fcbda65bed845a59 /indra/llprimitive/tests/llprimitive_test.cpp
parent1259e05edcef4d1e23b38c9ca06b4ecd3f858781 (diff)
correct licenses (fix problem with license change merge)
Diffstat (limited to 'indra/llprimitive/tests/llprimitive_test.cpp')
-rw-r--r--indra/llprimitive/tests/llprimitive_test.cpp21
1 files changed, 19 insertions, 2 deletions
diff --git a/indra/llprimitive/tests/llprimitive_test.cpp b/indra/llprimitive/tests/llprimitive_test.cpp
index 590b97645f..0d60c7cd15 100644
--- a/indra/llprimitive/tests/llprimitive_test.cpp
+++ b/indra/llprimitive/tests/llprimitive_test.cpp
@@ -2,8 +2,25 @@
* @file llprimitive_test.cpp
* @brief llprimitive tests
*
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2001&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$
*/