diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-01 02:13:55 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-01 02:13:55 +0000 |
| commit | 627c28da811f00ddd02a5c2af0762f427ac02a1b (patch) | |
| tree | 13e1deab87b9a3c56595b796bd17347e47a93658 /indra/test_apps | |
| parent | f2764d24a3b3563d66a683c84af22b61648755cb (diff) | |
| parent | 0929315ab103433275a71f26a4900ee0615932e9 (diff) | |
Merge with viewer-headless
Diffstat (limited to 'indra/test_apps')
| -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 |