summaryrefslogtreecommitdiff
path: root/doc/LICENSE-source.txt
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-09-27 15:20:27 -0500
committerDave Parks <davep@lindenlab.com>2010-09-27 15:20:27 -0500
commit7c2b9221d6678ea7a04f529efaa2e557abce504d (patch)
treeba0095eaad5cd0e95577051222953e4c773beac4 /doc/LICENSE-source.txt
parente6688f993f82d2683e3eadce96c893959c94be2d (diff)
parentdb85c5b327f872ba321f66726fb05b4b3c3af883 (diff)
merge
Diffstat (limited to 'doc/LICENSE-source.txt')
-rw-r--r--doc/LICENSE-source.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt
index 407402265e..200803bca8 100644
--- a/doc/LICENSE-source.txt
+++ b/doc/LICENSE-source.txt
@@ -3,11 +3,16 @@ Source code
The license for the source code in this distribution should be clearly
marked on each source file. Unless otherwise specified, the source
code in this distribution ("Source Code") is provided by Linden Lab to
-you under the terms of the GNU Lesser General Public License, version 2.1
-("LGPL"), unless you have obtained a separate licensing agreement
+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/LGPL-license.txt in this distribution, or
-online at http://secondlife.com/developers/opensource/lgplv2_1
+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,