diff options
| -rwxr-xr-x | linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index 68b9679..999f754 100755 --- a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp | |||
| @@ -3,33 +3,26 @@ | |||
| 3 | * @brief QuickTime plugin for LLMedia API plugin system | 3 | * @brief QuickTime plugin for LLMedia API plugin system |
| 4 | * | 4 | * |
| 5 | * @cond | 5 | * @cond |
| 6 | * $LicenseInfo:firstyear=2008&license=viewergpl$ | 6 | * $LicenseInfo:firstyear=2008&license=viewerlgpl$ |
| 7 | * | ||
| 8 | * Copyright (c) 2008-2010, Linden Research, Inc. | ||
| 9 | * | ||
| 10 | * Second Life Viewer Source Code | 7 | * Second Life Viewer Source Code |
| 11 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * Copyright (C) 2010, Linden Research, Inc. |
| 12 | * to you under the terms of the GNU General Public License, version 2.0 | ||
| 13 | * ("GPL"), unless you have obtained a separate licensing agreement | ||
| 14 | * ("Other License"), formally executed by you and Linden Lab. Terms of | ||
| 15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | ||
| 16 | * online at http://secondlife.com/developers/opensource/gplv2 | ||
| 17 | * | 9 | * |
| 18 | * There are special exceptions to the terms and conditions of the GPL as | 10 | * This library is free software; you can redistribute it and/or |
| 19 | * it is applied to this Source Code. View the full text of the exception | 11 | * modify it under the terms of the GNU Lesser General Public |
| 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 12 | * License as published by the Free Software Foundation; |
| 21 | * online at | 13 | * version 2.1 of the License only. |
| 22 | * http://secondlife.com/developers/opensource/flossexception | ||
| 23 | * | 14 | * |
| 24 | * By copying, modifying or distributing this software, you acknowledge | 15 | * This library is distributed in the hope that it will be useful, |
| 25 | * that you have read and understood your obligations described above, | 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 26 | * and agree to abide by those obligations. | 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 18 | * Lesser General Public License for more details. | ||
| 27 | * | 19 | * |
| 28 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 20 | * You should have received a copy of the GNU Lesser General Public |
| 29 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 21 | * License along with this library; if not, write to the Free Software |
| 30 | * COMPLETENESS OR PERFORMANCE. | 22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 31 | * $/LicenseInfo$ | ||
| 32 | * | 23 | * |
| 24 | * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA | ||
| 25 | * $/LicenseInfo$ | ||
| 33 | * @endcond | 26 | * @endcond |
| 34 | */ | 27 | */ |
| 35 | 28 | ||