diff options
Diffstat (limited to 'indra/media_plugins/example')
| -rw-r--r-- | indra/media_plugins/example/media_plugin_example.cpp | 67 | 
1 files changed, 32 insertions, 35 deletions
| diff --git a/indra/media_plugins/example/media_plugin_example.cpp b/indra/media_plugins/example/media_plugin_example.cpp index f5b077fea0..f8a871930e 100644 --- a/indra/media_plugins/example/media_plugin_example.cpp +++ b/indra/media_plugins/example/media_plugin_example.cpp @@ -3,30 +3,25 @@   * @brief Example plugin for LLMedia API plugin system   *   * @cond - * $LicenseInfo:firstyear=2008&license=viewergpl$ - * - * Copyright (c) 2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2008&license=viewerlgpl$   * 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. + * Copyright (C) 2010, Linden Research, Inc. + *  + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + *  + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU + * Lesser General Public License for more details. + *  + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA + *  + * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   * @endcond   */ @@ -119,17 +114,6 @@ void MediaPluginExample::receiveMessage( const char* message_string )  				std::string plugin_version = "Example media plugin, Example Version 1.0.0.0";  				message.setValue( "plugin_version", plugin_version );  				sendMessage( message ); - -				// Plugin gets to decide the texture parameters to use. -				message.setMessage( LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params" ); -				message.setValueS32( "default_width", mWidth ); -				message.setValueS32( "default_height", mHeight ); -				message.setValueS32( "depth", mDepth ); -				message.setValueU32( "internalformat", GL_RGBA ); -				message.setValueU32( "format", GL_RGBA ); -				message.setValueU32( "type", GL_UNSIGNED_BYTE ); -				message.setValueBoolean( "coords_opengl", false ); -				sendMessage( message );  			}  			else  			if ( message_name == "idle" ) @@ -191,7 +175,20 @@ void MediaPluginExample::receiveMessage( const char* message_string )  		else  		if ( message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA )  		{ -			if ( message_name == "size_change" ) +			if ( message_name == "init" ) +			{ +				// Plugin gets to decide the texture parameters to use. +				LLPluginMessage message( LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params" ); +				message.setValueS32( "default_width", mWidth ); +				message.setValueS32( "default_height", mHeight ); +				message.setValueS32( "depth", mDepth ); +				message.setValueU32( "internalformat", GL_RGBA ); +				message.setValueU32( "format", GL_RGBA ); +				message.setValueU32( "type", GL_UNSIGNED_BYTE ); +				message.setValueBoolean( "coords_opengl", false ); +				sendMessage( message ); +			} +			else if ( message_name == "size_change" )  			{  				std::string name = message_in.getValue( "name" );  				S32 width = message_in.getValueS32( "width" ); | 
