diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-17 13:35:39 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-17 13:35:39 -0400 |
| commit | 6e761bb5f2fac9155b03b74008cfca141968ae6c (patch) | |
| tree | 8fa1dcf8f2f6edae67e832dc34a6286901ae771d /indra/test_apps/llplugintest/llmediaplugintest.cpp | |
| parent | a5c43859c355afbb5a24d8599756297cad07f590 (diff) | |
| parent | 509457b8ef7bfb8e5b6dcb1a25996ae8fe329007 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/test_apps/llplugintest/llmediaplugintest.cpp')
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index e5a846f15a..5677308fb0 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -1593,8 +1593,8 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) } std::string user_data_path = std::string( cwd ) + "/"; #endif - - media_source->init( launcher_name, plugin_name, false, user_data_path ); + media_source->setUserDataPath(user_data_path); + media_source->init( launcher_name, plugin_name, false ); media_source->setDisableTimeout(mDisableTimeout); // make a new panel and save parameters @@ -1831,7 +1831,8 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) std::string user_data_path = std::string( cwd ) + "/"; #endif - media_source->init( launcher_name, plugin_name, false, user_data_path ); + media_source->setUserDataPath(user_data_path); + media_source->init( launcher_name, plugin_name, false ); media_source->setDisableTimeout(mDisableTimeout); // make a new panel and save parameters |