diff options
| author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
| commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
| tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llcommon/llindraconfigfile.cpp | |
| parent | Second Life viewer sources 1.22.11 (diff) | |
| download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz | |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llcommon/llindraconfigfile.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/linden/indra/llcommon/llindraconfigfile.cpp b/linden/indra/llcommon/llindraconfigfile.cpp index d64bc8f..ca63e28 100644 --- a/linden/indra/llcommon/llindraconfigfile.cpp +++ b/linden/indra/llcommon/llindraconfigfile.cpp | |||
| @@ -5,16 +5,27 @@ | |||
| 5 | * This class is an LLLiveFile that has config info for indra | 5 | * This class is an LLLiveFile that has config info for indra |
| 6 | * Currently only whether it's blacklisted | 6 | * Currently only whether it's blacklisted |
| 7 | * | 7 | * |
| 8 | * $LicenseInfo:firstyear=2007&license=internal$ | 8 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
| 9 | * | 9 | * |
| 10 | * Copyright (c) 2007-2009, Linden Research, Inc. | 10 | * Copyright (c) 2007-2009, Linden Research, Inc. |
| 11 | * | 11 | * |
| 12 | * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of | 12 | * Second Life Viewer Source Code |
| 13 | * this source code is governed by the Linden Lab Source Code Disclosure | 13 | * The source code in this file ("Source Code") is provided by Linden Lab |
| 14 | * Agreement ("Agreement") previously entered between you and Linden | 14 | * to you under the terms of the GNU General Public License, version 2.0 |
| 15 | * Lab. By accessing, using, copying, modifying or distributing this | 15 | * ("GPL"), unless you have obtained a separate licensing agreement |
| 16 | * software, you acknowledge that you have been informed of your | 16 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
| 17 | * obligations under the Agreement and agree to abide by those obligations. | 17 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
| 18 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 | ||
| 19 | * | ||
| 20 | * There are special exceptions to the terms and conditions of the GPL as | ||
| 21 | * it is applied to this Source Code. View the full text of the exception | ||
| 22 | * in the file doc/FLOSS-exception.txt in this software distribution, or | ||
| 23 | * online at | ||
| 24 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
| 25 | * | ||
| 26 | * By copying, modifying or distributing this software, you acknowledge | ||
| 27 | * that you have read and understood your obligations described above, | ||
| 28 | * and agree to abide by those obligations. | ||
| 18 | * | 29 | * |
| 19 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 30 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
| 20 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 31 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |