diff options
| author | Sam Kolb <skolb@lindenlab.com> | 2009-08-31 23:08:06 +0000 |
|---|---|---|
| committer | Sam Kolb <skolb@lindenlab.com> | 2009-08-31 23:08:06 +0000 |
| commit | 410e2228fdaec684f12c528e58e76f9b5169fe72 (patch) | |
| tree | f86aa82dae5cf3273eaa76796e1d7616563278e3 /indra | |
| parent | 5e7034a53be4a4f4862a81d09a6941db97a4f882 (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 21 | ||||
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.h | 2 |
3 files changed, 11 insertions, 19 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 297540ffc0..a34c9782c0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1583,10 +1583,3 @@ if (WINDOWS) ) 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) diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index cd90884d09..f668867a02 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -1,5 +1,5 @@ /** - * @file LLMediaPluginTest2.cpp + * @file LLMediaPluginTest.cpp * @brief Primary test application for LLMedia (Separate Process) Plugin system * * $LicenseInfo:firstyear=2008&license=viewergpl$ @@ -222,14 +222,13 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind 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 ); + }; } //////////////////////////////////////////////////////////////////////////////// @@ -2113,13 +2112,13 @@ int main( int argc, char* argv[] ) 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 ); diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h index 079b40ddc0..2d0ba0e3f6 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.h +++ b/indra/test_apps/llplugintest/llmediaplugintest.h @@ -1,5 +1,5 @@ /** - * @file LLMediaPluginTest2.cpp + * @file LLMediaPluginTest.cpp * @brief Primary test application for LLMedia (Separate Process) Plugin system * * $LicenseInfo:firstyear=2008&license=viewergpl$ |