diff options
| author | Callum Prentice <callum@lindenlab.com> | 2008-02-21 21:25:17 +0000 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2008-02-21 21:25:17 +0000 |
| commit | 34527df7401f48037205550fc5986da14684cf23 (patch) | |
| tree | c08b98ce42ed1cee780a935de357a037f9e1074e /indra/newview/llviewerparcelmediaautoplay.cpp | |
| parent | 0f30a85db9d29f0dfe2accb376904266dcf60124 (diff) | |
Updated header comments with our public license statement that reflects their public nature. DEV-10766
Not reviewed (no code changes - only comments)
Diffstat (limited to 'indra/newview/llviewerparcelmediaautoplay.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.cpp | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp index 112c6dfcea..e373d7d986 100644 --- a/indra/newview/llviewerparcelmediaautoplay.cpp +++ b/indra/newview/llviewerparcelmediaautoplay.cpp @@ -1,10 +1,32 @@ /** * @file llviewerparcelmediaautoplay.cpp - * @author Karl Stiefvater * @brief timer to automatically play media in a parcel * - * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc. - * $License$ + * $LicenseInfo:firstyear=2007&license=viewergpl$ + * + * Copyright (c) 2007-2008, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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$ */ #include "llviewerprecompiledheaders.h" @@ -61,7 +83,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick() std::string this_media_url; LLUUID this_media_texture_id; S32 this_parcel_id = 0; - + if (gParcelMgr) { this_parcel = gParcelMgr->getAgentParcel(); @@ -96,7 +118,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick() LLViewerImage *image = gImageList.getImage(this_media_texture_id, FALSE); F32 image_size = 0; - + if (image) { image_size = image->mMaxVirtualSize; @@ -121,9 +143,9 @@ BOOL LLViewerParcelMediaAutoPlay::tick() } } - + return FALSE; // continue ticking forever please. } - - - + + + |