diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 09:28:26 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 09:28:26 +0000 |
| commit | a402f4894d72209f9ac9bc9d7962c28b3c26bb18 (patch) | |
| tree | 1db4f4a35008b6f4281e6275b7a4beb679d285d6 /indra/test_apps | |
| parent | b42b421d25f3b3a7ea4f571388acb64f98e1f51d (diff) | |
| parent | ccc72757ef23fa7ffba066e5bdaf05e3f8a95cca (diff) | |
merge.
Diffstat (limited to 'indra/test_apps')
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index d987915bb8..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,7 +223,6 @@ 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 ) { @@ -1460,6 +1459,9 @@ std::string LLMediaPluginTest::mimeTypeFromUrl( std::string& url ) if ( url.find( ".txt" ) != std::string::npos ) // Apple Text descriptors mime_type = "video/quicktime"; else + if ( url.find( ".mp3" ) != std::string::npos ) // Apple Text descriptors + mime_type = "video/quicktime"; + else if ( url.find( "example://" ) != std::string::npos ) // Example plugin mime_type = "example/example"; |