2 files changed, 20 insertions, 17 deletions

diff --git a/linden/indra/media_plugins/example/CMakeLists.txt b/linden/indra/media_plugins/example/CMakeLists.txt
index 6d14c1b..7822300 100755
--- a/linden/indra/media_plugins/example/CMakeLists.txt
+++ b/linden/indra/media_plugins/example/CMakeLists.txt
@@ -14,7 +14,7 @@ include(PluginAPI)
 include(MediaPluginBase)
 include(FindOpenGL)
 
-#awfixme include(ExamplePlugin)
+#include(ExamplePlugin)
 
 include_directories(
     ${LLPLUGIN_INCLUDE_DIRS}
@@ -29,13 +29,13 @@ include_directories(
 
 ### media_plugin_example
 
-if(WORD_SIZE EQUAL 64)
+if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
         if(WINDOWS)
                 add_definitions(/FIXED:NO)
         else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
                 add_definitions(-fPIC)
         endif(WINDOWS)
-endif (WORD_SIZE EQUAL 64)
+endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4)
 
 set(media_plugin_example_SOURCE_FILES
     media_plugin_example.cpp
diff --git a/linden/indra/media_plugins/example/media_plugin_example.cpp b/linden/indra/media_plugins/example/media_plugin_example.cpp
index 83abae0..1eabe6c 100755
--- a/linden/indra/media_plugins/example/media_plugin_example.cpp
+++ b/linden/indra/media_plugins/example/media_plugin_example.cpp
@@ -13,13 +13,13 @@
  * ("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://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 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://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 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,
@@ -29,6 +29,7 @@
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
+ * 
  * @endcond
  */
 
@@ -120,17 +121,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" )
@@ -192,7 +182,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" );