diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:04:30 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:04:30 +0100 |
| commit | 0f5df48ff8d2e92ccf20efcb534b344e549f0a95 (patch) | |
| tree | 3a6330089446adfeb920d8b4c125edb2fba97c25 /indra/viewer_components | |
| parent | 0a74d1593513dc3209fdb29a8dc56b2794b36a29 (diff) | |
| parent | fc5a97fc78a0ecd551e7c0ef03867da81b730090 (diff) | |
Automated merge with file:///Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
Diffstat (limited to 'indra/viewer_components')
| -rw-r--r-- | indra/viewer_components/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/viewer_components/login/tests/lllogin_test.cpp | 25 |
2 files changed, 24 insertions, 2 deletions
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$ */ |