Commits

Sam Kolb  committed 3cdd0cb

Removed some final dependencies to Awesomium and Flash ActiveX (mostly porting over Callum's change: r132166)

DEV-39138 build process on parabuild fails due to missing flash activex plugin

  • Participants
  • Parent commits 31e1ccb

Comments (0)

Files changed (3)

File indra/newview/CMakeLists.txt

         )
 endif (WINDOWS)
 
-if (DARWIN)
-# Don't do this here -- it's taken care of by viewer_manifest.py
-#  add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
-#    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
-#  )
-endif (DARWIN)

File indra/test_apps/llplugintest/llmediaplugintest.cpp

 /**
- * @file LLMediaPluginTest2.cpp
+ * @file LLMediaPluginTest.cpp
  * @brief Primary test application for LLMedia (Separate Process) Plugin system
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
 	resetView();
 
 	// initial media panel
-	//const int num_initial_panels = 4;
-	//for( int i = 0; i < num_initial_panels; ++i )
-	//{
-	//	addMediaPanel( mBookmarks[ rand() % ( mBookmarks.size() - 1 ) + 1 ].second );
-	//};
 
-	// always add a Web panel for testing
-	addMediaPanel( "http://www.google.com" );
+	const int num_initial_panels = 1;
+	for( int i = 0; i < num_initial_panels; ++i )
+	{
+		//addMediaPanel( mBookmarks[ rand() % ( mBookmarks.size() - 1 ) + 1 ].second );
+		addMediaPanel( mHomeWebUrl );
+	};
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 	const int app_window_x = 80;
 	const int app_window_y = 0;
-	const int app_window_width = 964;
-	const int app_window_height = 964;
+	const int app_window_width = 960;
+	const int app_window_height = 960;
 
 	glutInitWindowPosition( app_window_x, app_window_y );
 	glutInitWindowSize( app_window_width, app_window_height );
 
-	int app_window_handle = glutCreateWindow( "LLMediaPluginTest2" );
+	int app_window_handle = glutCreateWindow( "LLMediaPluginTest" );
 
 	glutDisplayFunc( glutDisplay );
 

File indra/test_apps/llplugintest/llmediaplugintest.h

 /**
- * @file LLMediaPluginTest2.cpp
+ * @file LLMediaPluginTest.cpp
  * @brief Primary test application for LLMedia (Separate Process) Plugin system
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$