diff options
| -rw-r--r-- | indra/llui/lluifwd.h | 31 | ||||
| -rw-r--r-- | indra/newview/llfloaterurlentry.cpp | 39 | ||||
| -rw-r--r-- | indra/newview/llfloaterurlentry.h | 31 | ||||
| -rw-r--r-- | indra/newview/llmimetypes.cpp | 31 | ||||
| -rw-r--r-- | indra/newview/llmimetypes.h | 31 | ||||
| -rw-r--r-- | indra/newview/llpanellandmedia.cpp | 45 | ||||
| -rw-r--r-- | indra/newview/llpanellandmedia.h | 31 | ||||
| -rw-r--r-- | indra/newview/llparcelselection.cpp | 39 | ||||
| -rw-r--r-- | indra/newview/llparcelselection.h | 29 | ||||
| -rw-r--r-- | indra/newview/llurlhistory.cpp | 33 | ||||
| -rw-r--r-- | indra/newview/llurlhistory.h | 33 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 75 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.h | 31 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 51 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmedia.h | 31 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.cpp | 40 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.h | 31 |
17 files changed, 511 insertions, 121 deletions
diff --git a/indra/llui/lluifwd.h b/indra/llui/lluifwd.h index 23f441ffea..c0287f2508 100644 --- a/indra/llui/lluifwd.h +++ b/indra/llui/lluifwd.h @@ -1,11 +1,34 @@ -/** +/** * @file lluifwd.h - * @author James Cook * @brief Forward declarations of common LLUI widget types. * - * 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$ */ + #ifndef LLUIFWD_H #define LLUIFWD_H diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp index f121efb6b7..16d869ea6f 100644 --- a/indra/newview/llfloaterurlentry.cpp +++ b/indra/newview/llfloaterurlentry.cpp @@ -1,9 +1,32 @@ -/** +/** * @file llfloaterurlentry.cpp * @brief LLFloaterURLEntry class implementation * - * Copyright (c) 2002-$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" @@ -22,7 +45,7 @@ static LLFloaterURLEntry* sInstance = NULL; // Move this to its own file. -// helper class that tries to download a URL from a web site and calls a method +// helper class that tries to download a URL from a web site and calls a method // on the Panel Land Media and to discover the MIME type class LLMediaTypeResponder : public LLHTTPClient::Responder { @@ -169,7 +192,7 @@ bool LLFloaterURLEntry::addURLToCombobox(const std::string& media_url) return false; } -// static +// static //----------------------------------------------------------------------------- // onBtnOK() //----------------------------------------------------------------------------- @@ -209,7 +232,7 @@ void LLFloaterURLEntry::onBtnOK( void* userdata ) { self->headerFetchComplete(0, scheme); } - + // Grey the buttons until we get the header response self->childSetEnabled("ok_btn", false); self->childSetEnabled("cancel_btn", false); @@ -220,7 +243,7 @@ void LLFloaterURLEntry::onBtnOK( void* userdata ) self->childSetVisible("loading_label", true); } -// static +// static //----------------------------------------------------------------------------- // onBtnCancel() //----------------------------------------------------------------------------- @@ -230,7 +253,7 @@ void LLFloaterURLEntry::onBtnCancel( void* userdata ) self->close(); } -// static +// static //----------------------------------------------------------------------------- // onBtnClear() //----------------------------------------------------------------------------- diff --git a/indra/newview/llfloaterurlentry.h b/indra/newview/llfloaterurlentry.h index 95954d82bb..53e77880f5 100644 --- a/indra/newview/llfloaterurlentry.h +++ b/indra/newview/llfloaterurlentry.h @@ -1,9 +1,32 @@ -/** +/** * @file llfloaternamedesc.h * @brief LLFloaterNameDesc class definition * - * Copyright (c) 2002-$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$ */ #ifndef LL_LLFLOATERURLENTRY_H @@ -25,7 +48,7 @@ public: void updateFromLandMediaPanel(); void headerFetchComplete(U32 status, const std::string& mime_type); - + bool addURLToCombobox(const std::string& media_url); private: diff --git a/indra/newview/llmimetypes.cpp b/indra/newview/llmimetypes.cpp index 3c4dab8e04..66f6b04720 100644 --- a/indra/newview/llmimetypes.cpp +++ b/indra/newview/llmimetypes.cpp @@ -1,12 +1,35 @@ -/** +/** * @file llmimetypes.cpp - * @author James Cook * @brief Translates a MIME type like "video/quicktime" into a * localizable user-friendly string like "QuickTime Movie" * - * 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" #include "llmimetypes.h" diff --git a/indra/newview/llmimetypes.h b/indra/newview/llmimetypes.h index 1c309477a2..3ffe0a4f23 100644 --- a/indra/newview/llmimetypes.h +++ b/indra/newview/llmimetypes.h @@ -1,12 +1,35 @@ -/** +/** * @file llmimetypes.h - * @author James Cook * @brief Translates a MIME type like "video/quicktime" into a * localizable user-friendly string like "QuickTime Movie" * - * 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$ */ + #ifndef LLMIMETYPES_H #define LLMIMETYPES_H diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp index eb40eefcb7..db85294fcc 100644 --- a/indra/newview/llpanellandmedia.cpp +++ b/indra/newview/llpanellandmedia.cpp @@ -1,12 +1,35 @@ -/** +/** * @file llpanellandmedia.cpp - * @author Callum Prentice, Sam Kolb, James Cook * @brief Allows configuration of "media" for a land parcel, * for example movies, web pages, and audio. * - * 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" #include "llpanellandmedia.h" @@ -79,7 +102,7 @@ BOOL LLPanelLandMedia::postBuild() { llwarns << "LLViewerUICtrlFactory::getTexturePickerByName() returned NULL for 'media texure'" << llendl; } - + mMediaAutoScaleCheck = LLUICtrlFactory::getCheckBoxByName(this, "media_auto_scale"); childSetCommitCallback("media_auto_scale", onCommitAny, this); @@ -175,7 +198,7 @@ void LLPanelLandMedia::refresh() // don't display urls if you're not able to change it // much requested change in forums so people can't 'steal' urls - // NOTE: bug#2009 means this is still vunerable - however, bug + // NOTE: bug#2009 means this is still vunerable - however, bug // should be closed since this bug opens up major security issues elsewhere. bool obscure_media = ! can_change_media && parcel->getObscureMedia(); bool obscure_music = ! can_change_media && parcel->getObscureMusic(); @@ -289,7 +312,7 @@ void LLPanelLandMedia::onCommitType(LLUICtrl *ctrl, void *userdata) self->childSetText("mime_type", LLMIMETypes::findDefaultMimeType(new_type)); } onCommitAny(ctrl, userdata); - + } // static void LLPanelLandMedia::onCommitAny(LLUICtrl *ctrl, void *userdata) @@ -321,7 +344,7 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl *ctrl, void *userdata) BOOL voice_enabled; BOOL voice_estate_chan; - + switch(voice_setting) { default: @@ -338,7 +361,7 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl *ctrl, void *userdata) voice_estate_chan = FALSE; break; } - + // Remove leading/trailing whitespace (common when copying/pasting) LLString::trim(music_url); LLString::trim(media_url); @@ -359,7 +382,7 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl *ctrl, void *userdata) parcel->setObscureMedia( obscure_media ); parcel->setObscureMusic( obscure_music ); - // Send current parcel data upstream to server + // Send current parcel data upstream to server gParcelMgr->sendParcelPropertiesUpdate( parcel ); // Might have changed properties, so let's redraw! @@ -370,7 +393,7 @@ void LLPanelLandMedia::onSetBtn(void *userdata) { LLPanelLandMedia *self = (LLPanelLandMedia *)userdata; self->mURLEntryFloater = LLFloaterURLEntry::show( self->getHandle() ); - LLFloater* parent_floater = gFloaterView->getParentFloater(self); + LLFloater* parent_floater = gFloaterView->getParentFloater(self); if (parent_floater) { parent_floater->addDependentFloater(self->mURLEntryFloater.get()); diff --git a/indra/newview/llpanellandmedia.h b/indra/newview/llpanellandmedia.h index 769bc27532..8ec8bcc013 100644 --- a/indra/newview/llpanellandmedia.h +++ b/indra/newview/llpanellandmedia.h @@ -1,12 +1,35 @@ -/** +/** * @file llpanellandmedia.h - * @author Callum Prentice, Sam Kolb, James Cook * @brief Allows configuration of "media" for a land parcel, * for example movies, web pages, and audio. * - * 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$ */ + #ifndef LLPANELLANDMEDIA_H #define LLPANELLANDMEDIA_H diff --git a/indra/newview/llparcelselection.cpp b/indra/newview/llparcelselection.cpp index e49ae57bcf..1837481efb 100644 --- a/indra/newview/llparcelselection.cpp +++ b/indra/newview/llparcelselection.cpp @@ -1,9 +1,32 @@ -/** +/** * @file llparcelselection.cpp * @brief Information about the currently selected 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" @@ -16,14 +39,14 @@ // static LLPointer<LLParcelSelection> LLParcelSelection::sNullSelection; -template<> - const LLSafeHandle<LLParcelSelection>::NullFunc +template<> + const LLSafeHandle<LLParcelSelection>::NullFunc LLSafeHandle<LLParcelSelection>::sNullFunc = LLParcelSelection::getNullParcelSelection; // // LLParcelSelection // -LLParcelSelection::LLParcelSelection() : +LLParcelSelection::LLParcelSelection() : mParcel(NULL), mSelectedMultipleOwners(FALSE), mWholeParcelSelected(FALSE), @@ -33,7 +56,7 @@ LLParcelSelection::LLParcelSelection() : { } -LLParcelSelection::LLParcelSelection(LLParcel* parcel) : +LLParcelSelection::LLParcelSelection(LLParcel* parcel) : mParcel(parcel), mSelectedMultipleOwners(FALSE), mWholeParcelSelected(FALSE), @@ -77,6 +100,6 @@ LLParcelSelection* LLParcelSelection::getNullParcelSelection() { sNullSelection = new LLParcelSelection; } - + return sNullSelection; } diff --git a/indra/newview/llparcelselection.h b/indra/newview/llparcelselection.h index e6729646c7..e51e0ec97c 100644 --- a/indra/newview/llparcelselection.h +++ b/indra/newview/llparcelselection.h @@ -1,9 +1,32 @@ -/** +/** * @file llparcelselection.h * @brief Information about the currently selected 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$ */ #ifndef LLPARCELSELECTION_H diff --git a/indra/newview/llurlhistory.cpp b/indra/newview/llurlhistory.cpp index 86a12a73fa..8f9c926616 100644 --- a/indra/newview/llurlhistory.cpp +++ b/indra/newview/llurlhistory.cpp @@ -1,11 +1,34 @@ -/** +/** * @file llurlhistory.cpp - * @author Sam Kolb * @brief Manages a list of recent URLs * - * 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" #include "llurlhistory.h" @@ -63,7 +86,7 @@ bool LLURLHistory::saveFile(const LLString& filename) return true; } // static -// This function returns a portion of the history llsd that contains the collected +// This function returns a portion of the history llsd that contains the collected // url history LLSD LLURLHistory::getURLHistory(const std::string& collection) { diff --git a/indra/newview/llurlhistory.h b/indra/newview/llurlhistory.h index 210057f746..317440f032 100644 --- a/indra/newview/llurlhistory.h +++ b/indra/newview/llurlhistory.h @@ -1,15 +1,38 @@ -/** +/** * @file llurlhistory.h - * @author Sam Kolb * @brief Manages a list of recent URLs * - * 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$ */ + #ifndef LLURLHISTORY_H #define LLURLHISTORY_H -#include "llstring.h" +#include "llstring.h" class LLSD; diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index b8ff934f8d..f86d822d90 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1,11 +1,34 @@ -/** +/** * @file llviewermedia.cpp - * @author Callum Prentice & James Cook * @brief Client interface to the media engine * - * 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" #include "llviewermedia.h" @@ -44,7 +67,7 @@ class LLViewerMediaImpl const LLUUID& placeholder_texture_id, S32 media_width, S32 media_height, U8 media_auto_scale, U8 media_loop); - + void stop(); void pause(); void start(); @@ -62,10 +85,10 @@ class LLViewerMediaImpl public: // a single media url with some data and an impl. - LLMediaBase* mMediaSource; + LLMediaBase* mMediaSource; LLUUID mMovieImageID; bool mMovieImageHasMips; - std::string mMediaURL; + std::string mMediaURL; std::string mMimeType; private: void initializePlaceholderImage(LLViewerImage *placeholder_image, LLMediaBase *media_source); @@ -97,20 +120,20 @@ void LLViewerMediaImpl::play(const std::string& media_url, { // first stop any previously playing media stop(); - + // Save this first, as init/load below may fire events mMovieImageID = placeholder_texture_id; - // If the mime_type passed in is different than the cached one, and + // If the mime_type passed in is different than the cached one, and // Auto-discovery is turned OFF, replace the cached mime_type with the new one. - if(mime_type != mMimeType && + if(mime_type != mMimeType && ! gSavedSettings.getBOOL("AutoMimeDiscovery")) { mMimeType = mime_type; } LLURI url(media_url); std::string scheme = url.scheme() != "" ? url.scheme() : "http"; - + LLMediaManager* mgr = LLMediaManager::getInstance(); mMediaSource = mgr->createSourceFromMimeType(scheme, mMimeType ); if ( !mMediaSource ) @@ -123,12 +146,12 @@ void LLViewerMediaImpl::play(const std::string& media_url, } return; } - + if ((media_width != 0) && (media_height != 0)) { mMediaSource->setRequestedMediaSize(media_width, media_height); } - + mMediaSource->setLooping(media_loop); mMediaSource->setAutoScaled(media_auto_scale); mMediaSource->addObserver( this ); @@ -239,7 +262,7 @@ void LLViewerMediaImpl::initializePlaceholderImage(LLViewerImage *placeholder_im //int media_rowspan = media_source->getMediaRowSpan(); // if width & height are invalid, don't bother doing anything - if ( media_width < 1 || media_height < 1 ) + if ( media_width < 1 || media_height < 1 ) return; llinfos << "initializing media placeholder" << llendl; @@ -257,12 +280,12 @@ void LLViewerMediaImpl::initializePlaceholderImage(LLViewerImage *placeholder_im // MEDIAOPT: seems insane that we actually have to make an imageraw then // immediately discard it LLPointer<LLImageRaw> raw = new LLImageRaw(texture_width, texture_height, texture_depth); - raw->clear(0x0f, 0x0f, 0x0f, 0xff); + raw->clear(0x0f, 0x0f, 0x0f, 0xff); int discard_level = 0; // ask media source for correct GL image format constants - placeholder_image->setExplicitFormat(media_source->getTextureFormatInternal(), - media_source->getTextureFormatPrimary(), + placeholder_image->setExplicitFormat(media_source->getTextureFormatInternal(), + media_source->getTextureFormatPrimary(), media_source->getTextureFormatType()); placeholder_image->createGLTexture(discard_level, raw); @@ -342,7 +365,7 @@ void LLViewerMediaImpl::onMediaSizeChange(const EventType& event_in) { // destroy existing GL image viewerImage->destroyGLTexture(); - + // set new size viewerImage->setSize( renderer->getTextureWidth(), renderer->getTextureHeight(), @@ -356,8 +379,8 @@ void LLViewerMediaImpl::onMediaSizeChange(const EventType& event_in) } // Set the explicit format the instance wants - viewerImage->setExplicitFormat(renderer->getTextureFormatInternal(), - renderer->getTextureFormatPrimary(), + viewerImage->setExplicitFormat(renderer->getTextureFormatInternal(), + renderer->getTextureFormatPrimary(), renderer->getTextureFormatType(), renderer->getTextureFormatSwapBytes()); // This should be redundant, but just in case: @@ -440,7 +463,7 @@ void LLViewerMedia::initClass() init_data->setBrowserUserAgentId( codec.str() ); std::string application_dir = gDirUtilp->getExecutableDir(); - + init_data->setBrowserApplicationDir( application_dir ); std::string profile_dir = gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ); init_data->setBrowserProfileDir( profile_dir ); @@ -530,7 +553,7 @@ bool LLViewerMedia::getMediaSize(S32 *media_width, S32 *media_height) if ( sViewerMediaImpl.mMediaSource != NULL ) { - *media_width = sViewerMediaImpl.mMediaSource->getMediaWidth(); + *media_width = sViewerMediaImpl.mMediaSource->getMediaWidth(); *media_height = sViewerMediaImpl.mMediaSource->getMediaHeight(); return true; } @@ -543,7 +566,7 @@ bool LLViewerMedia::getTextureSize(S32 *texture_width, S32 *texture_height) { if ( sViewerMediaImpl.mMediaSource != NULL ) { - S32 media_width = sViewerMediaImpl.mMediaSource->getMediaWidth(); + S32 media_width = sViewerMediaImpl.mMediaSource->getMediaWidth(); S32 media_height = sViewerMediaImpl.mMediaSource->getMediaHeight(); *texture_width = LLMediaManager::textureWidthFromMediaWidth( media_width ); *texture_height = LLMediaManager::textureHeightFromMediaHeight( media_height ); @@ -564,14 +587,14 @@ void LLViewerMedia::updateImagesMediaStreams() bool LLViewerMedia::isMediaPlaying() { LLMediaBase::EStatus status = sViewerMediaImpl.getStatus(); - return (status == LLMediaBase::STATUS_STARTED ); + return (status == LLMediaBase::STATUS_STARTED ); } ////////////////////////////////////////////////////////////////////////////////////////// // static bool LLViewerMedia::isMediaPaused() { LLMediaBase::EStatus status = sViewerMediaImpl.getStatus(); - return (status == LLMediaBase::STATUS_PAUSED); + return (status == LLMediaBase::STATUS_PAUSED); } ////////////////////////////////////////////////////////////////////////////////////////// // static @@ -581,7 +604,7 @@ bool LLViewerMedia::hasMedia() } ////////////////////////////////////////////////////////////////////////////////////////// -//static +//static bool LLViewerMedia::isActiveMediaTexture(const LLUUID& id) { return (id.notNull() diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 6ecaea54ce..67a75c7b0f 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -1,11 +1,34 @@ -/** +/** * @file llviewermedia.h - * @author Callum Prentice & James Cook * @brief Client interface to the media engine * - * 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$ */ + #ifndef LLVIEWERMEDIA_H #define LLVIEWERMEDIA_H diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 4c9a0aab95..12523f487b 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -1,11 +1,34 @@ -/** +/** * @file llviewerparcelmedia.cpp - * @author Callum Prentice & James Cook * @brief Handlers for multimedia on a per-parcel basis * - * 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" #include "llviewerparcelmedia.h" @@ -26,12 +49,12 @@ S32 LLViewerParcelMedia::sMediaParcelLocalID = 0; LLUUID LLViewerParcelMedia::sMediaRegionID; // Move this to its own file. -// helper class that tries to download a URL from a web site and calls a method +// helper class that tries to download a URL from a web site and calls a method // on the Panel Land Media and to discover the MIME type class LLMimeDiscoveryResponder : public LLHTTPClient::Responder { public: - LLMimeDiscoveryResponder( ) + LLMimeDiscoveryResponder( ) {} @@ -161,12 +184,12 @@ void LLViewerParcelMedia::update(LLParcel* parcel) void LLViewerParcelMedia::play(LLParcel* parcel) { lldebugs << "LLViewerParcelMedia::play" << llendl; - + if (!parcel) return; if (!gSavedSettings.getBOOL("AudioStreamingVideo")) return; - + std::string media_url = parcel->getMediaURL(); std::string mime_type = parcel->getMediaType(); LLUUID placeholder_texture_id = parcel->getMediaID(); @@ -232,10 +255,10 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg msg->getU32( "CommandBlock", "Command", command); msg->getF32( "CommandBlock", "Time", time ); - if (flags &( (1<<PARCEL_MEDIA_COMMAND_STOP) - | (1<<PARCEL_MEDIA_COMMAND_PAUSE) - | (1<<PARCEL_MEDIA_COMMAND_PLAY) - | (1<<PARCEL_MEDIA_COMMAND_LOOP) + if (flags &( (1<<PARCEL_MEDIA_COMMAND_STOP) + | (1<<PARCEL_MEDIA_COMMAND_PAUSE) + | (1<<PARCEL_MEDIA_COMMAND_PLAY) + | (1<<PARCEL_MEDIA_COMMAND_LOOP) | (1<<PARCEL_MEDIA_COMMAND_UNLOAD) )) { // stop @@ -303,13 +326,13 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void * S32 media_height = 0; U8 media_auto_scale = FALSE; U8 media_loop = FALSE; - + msg->getUUID( "DataBlock", "MediaID", media_id ); char media_url_buffer[257]; msg->getString( "DataBlock", "MediaURL", 255, media_url_buffer ); media_url = media_url_buffer; msg->getU8("DataBlock", "MediaAutoScale", media_auto_scale); - + if (msg->getNumberOfBlocks("DataBlockExtended")) // do we have the extended data? { char media_type_buffer[257]; diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h index bf391a83cb..a896b18664 100644 --- a/indra/newview/llviewerparcelmedia.h +++ b/indra/newview/llviewerparcelmedia.h @@ -1,11 +1,34 @@ -/** +/** * @file llviewerparcelmedia.h - * @author Callum Prentice & James Cook * @brief Handlers for multimedia on a per-parcel basis * - * 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$ */ + #ifndef LLVIEWERPARCELMEDIA_H #define LLVIEWERPARCELMEDIA_H 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. } - - - + + + diff --git a/indra/newview/llviewerparcelmediaautoplay.h b/indra/newview/llviewerparcelmediaautoplay.h index 20b132c827..9c35eedc60 100644 --- a/indra/newview/llviewerparcelmediaautoplay.h +++ b/indra/newview/llviewerparcelmediaautoplay.h @@ -1,11 +1,34 @@ /** * @file llviewerparcelmediaautoplay.h - * @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$ */ + #ifndef LLVIEWERPARCELMEDIAAUTOPLAY_H #define LLVIEWERPARCELMEDIAAUTOPLAY_H @@ -21,7 +44,7 @@ class LLViewerParcelMediaAutoPlay : LLEventTimer static void initClass(); static void cleanupClass(); static void playStarted(); - + private: S32 mLastParcelID; BOOL mPlayed; |