From bb2770fc095fc79af8d3c47c3ac3ca0d680eae06 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 12 Aug 2010 14:56:40 +0100 Subject: Remove dependency on viewer_components/eventhost --- indra/viewer_components/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) 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) -- cgit v1.2.3 From 0bc87df82bfbf7e15d8ac919bd57524fe685d491 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 12 Aug 2010 15:06:31 +0100 Subject: Change license on lllogin_test.cpp to allow it to be exported. Set to viewergpl for now. --- .../viewer_components/login/tests/lllogin_test.cpp | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) 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$ */ -- cgit v1.2.3 From fedb5a25a2f259e115702bfa0e82fffe643ca0c0 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 12 Aug 2010 20:30:21 -0400 Subject: correct license tags from "internal" to "viewergpl" --- indra/cmake/run_build_test.py | 2 +- indra/lib/python/indra/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 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. -- cgit v1.2.3 From fc5a97fc78a0ecd551e7c0ef03867da81b730090 Mon Sep 17 00:00:00 2001 From: convert-repo Date: Fri, 13 Aug 2010 06:38:37 +0000 Subject: update tags --- .hgtags | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .hgtags diff --git a/.hgtags b/.hgtags new file mode 100644 index 0000000000..c5a7203d87 --- /dev/null +++ b/.hgtags @@ -0,0 +1,21 @@ +003dd9461bfa479049afcc34545ab3431b147c7c v2start +08398e650c222336bb2b6de0cd3bba944aef11b4 2-1rn1 +0962101bfa7df0643a6e625786025fe7f8a6dc97 2-1-beta-2 +12769e547e30067d494a6c01479a18107366ce2f beta-5 +17fc2908e9a1ef34a9f53a41a393caf5c3cac390 beta-3-5 +1e2b517adc2ecb342cd3c865f2a6ccf82a3cf8d7 2-1-beta-3 +3469d90a115b900f8f250e137bbd9b684130f5d2 beta-4 +3e4b947f79d88c385e8218cbc0731cef0e42cfc4 2-1-beta-1 +46002088d9a4489e323b8d56131c680eaa21258c viewer-2-1-0-start +4f777ffb99fefdc6497c61385c22688ff149c659 viewer-2-0-0 +52d96ad3d39be29147c5b2181b3bb46af6164f0e alpha-3 +668851b2ef0f8cf8df07a0fba429e4a6c1e70abb viewer-2-0-1 +7f16e79826d377f5f9f5b33dc721ab56d0d7dc8f alpha-4 +7f16e79826d377f5f9f5b33dc721ab56d0d7dc8f fork to viewer-20qa +80bc6cff515118a36108967af49d3f8105c95bc9 viewer-2-0-2-start +b03065d018b8a2e28b7de85b293a4c992cb4c12d 2-1-release +b8419565906e4feb434426d8d9b17dd1458e24b2 alpha-6 +c6969fe44e58c542bfc6f1bd6c0be2fa860929ac 2-1-beta-4 +d2382d374139850efa5bb6adfb229e3e656cfc40 howard-demo +d40ac9dd949cba6dab1cc386da6a2027690c2519 alpha-5 +d6781e22543acd7e21b967209f3c6e7003d380e3 fork to viewer-2-0 -- cgit v1.2.3