diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-09 20:18:26 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-09 20:18:26 -0800 |
| commit | 76cb9a7796ffce930458aae00147f8dafa4b33fb (patch) | |
| tree | c9553396094aba4608da58662e5383c009423d2e /indra/test_apps/llplugintest/llmediaplugintest.cpp | |
| parent | b82f2c4e4d8c4b9a349e4cd933dff7a0844019c0 (diff) | |
| parent | 0ea1b472c636415a48b8cc688ec9b7663be6dc9d (diff) | |
STORM-986 : pull into viewer-development
Diffstat (limited to 'indra/test_apps/llplugintest/llmediaplugintest.cpp')
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 4a2272032b..e9d4d99753 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -1620,7 +1620,7 @@ mediaPanel* LLMediaPluginTest::addMediaPanel( std::string url ) std::string user_data_path = std::string( cwd ) + "/"; #endif media_source->setUserDataPath(user_data_path); - media_source->init( launcher_name, plugin_name, false ); + media_source->init( launcher_name, user_data_path, plugin_name, false ); media_source->setDisableTimeout(mDisableTimeout); // make a new panel and save parameters @@ -1860,7 +1860,7 @@ mediaPanel* LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string #endif media_source->setUserDataPath(user_data_path); - media_source->init( launcher_name, plugin_name, false ); + media_source->init( launcher_name, user_data_path, plugin_name, false ); media_source->setDisableTimeout(mDisableTimeout); // make a new panel and save parameters |