diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-24 16:14:17 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-24 16:14:17 +0100 |
| commit | 8c5d7fa7a5fcc774924d40c68d4b52cc6bf95b27 (patch) | |
| tree | 111d0a2f4772326e2991a4c7ceb8e07c3554a339 | |
| parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) | |
| parent | fc5a97fc78a0ecd551e7c0ef03867da81b730090 (diff) | |
Automated merge with file:///home/moss/hg/tofu-viewer-public
| -rw-r--r-- | indra/cmake/run_build_test.py | 2 | ||||
| -rw-r--r-- | indra/lib/python/indra/__init__.py | 2 | ||||
| -rw-r--r-- | indra/viewer_components/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/viewer_components/login/tests/lllogin_test.cpp | 25 |
4 files changed, 26 insertions, 4 deletions
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index 0f6967e42a..1c57d5139c 100644 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -22,7 +22,7 @@ python run_build_test.py -DFOO=bar myprog somearg otherarg sets environment variable FOO=bar, then runs: myprog somearg otherarg -$LicenseInfo:firstyear=2009&license=internal$ +$LicenseInfo:firstyear=2009&license=viewergpl$ Copyright (c) 2009, Linden Research, Inc. $/LicenseInfo$ """ diff --git a/indra/lib/python/indra/__init__.py b/indra/lib/python/indra/__init__.py index 9daab34803..b8fe4971c5 100644 --- a/indra/lib/python/indra/__init__.py +++ b/indra/lib/python/indra/__init__.py @@ -2,7 +2,7 @@ @file __init__.py @brief Initialization file for the indra module. -$LicenseInfo:firstyear=2006&license=internal$ +$LicenseInfo:firstyear=2006&license=viewergpl$ Copyright (c) 2006-2009, Linden Research, Inc. diff --git a/indra/viewer_components/CMakeLists.txt b/indra/viewer_components/CMakeLists.txt index c95c854b7c..0993b64b14 100644 --- a/indra/viewer_components/CMakeLists.txt +++ b/indra/viewer_components/CMakeLists.txt @@ -1,5 +1,4 @@ # -*- cmake -*- add_subdirectory(login) -add_subdirectory(eventhost) diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp index 51f5cd0692..5a3c205385 100644 --- a/indra/viewer_components/login/tests/lllogin_test.cpp +++ b/indra/viewer_components/login/tests/lllogin_test.cpp @@ -4,8 +4,31 @@ * @date 2009-02-26 * @brief Tests of lllogin.cpp. * - * $LicenseInfo:firstyear=2009&license=internal$ + * $LicenseInfo:firstyear=2009&license=viewergpl$ + * * Copyright (c) 2009, 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://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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$ */ |