summaryrefslogtreecommitdiff
path: root/indra/test_apps
diff options
context:
space:
mode:
authorcallum <none@none>2009-11-16 19:47:35 -0800
committercallum <none@none>2009-11-16 19:47:35 -0800
commitf693e70c240e1c3800158db5e245f3554598bdf2 (patch)
tree5044257eb24af458d2a51714dcab5aa79bf26ee2 /indra/test_apps
parent0ae9284adb522b4833263aac70ef8d3f0710273b (diff)
Restore a minor change to the media test mule that was checked in by mistake
Diffstat (limited to 'indra/test_apps')
-rw-r--r--indra/test_apps/llplugintest/llmediaplugintest.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp
index ee27ad77df..27cb52a507 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.cpp
+++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp
@@ -197,7 +197,7 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
{
LLError::initForApplication(".");
LLError::setDefaultLevel(LLError::LEVEL_INFO);
-// LLError::setTagLevel("Plugin", LLError::LEVEL_DEBUG);
+ //LLError::setTagLevel("Plugin", LLError::LEVEL_DEBUG);
}
// lots of randomness in this app
@@ -223,16 +223,12 @@ LLMediaPluginTest::LLMediaPluginTest( int app_window, int window_width, int wind
resetView();
// initial media panel
- //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 );
- //};
-
-addMediaPanel( "http://chemicaljump.com/wp-content/uploads/2009/10/lth34/Proxy-8000.mp3" );
-addMediaPanel( "http://movies.apple.com/movies/sony_pictures/zombieland/zombieland-inttlr_h.320.mov" );
-
+ 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 );
+ };
}
////////////////////////////////////////////////////////////////////////////////