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.

2 files changed, 50 insertions, 4 deletions

diff --git a/scripts/setup-path.py b/scripts/setup-path.py
index a623b2a8ee..87600e37e0 100755
--- a/scripts/setup-path.py
+++ b/scripts/setup-path.py
@@ -4,8 +4,31 @@
 @brief Get the python library directory in the path, so we don't have
 to screw with PYTHONPATH or symbolic links.
 
-Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
-$License$
+$LicenseInfo:firstyear=2007&license=viewergpl$
+
+Copyright (c) 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$
 """
 
 import sys
diff --git a/scripts/template_verifier.py b/scripts/template_verifier.py
index 708c007796..ac814aedc0 100755
--- a/scripts/template_verifier.py
+++ b/scripts/template_verifier.py
@@ -3,8 +3,31 @@
 @file template_verifier.py
 @brief Message template compatibility verifier.
 
-Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
-$License$
+$LicenseInfo:firstyear=2007&license=viewergpl$
+
+Copyright (c) 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$
 """
 
 """template_verifier is a script which will compare the