diff options
| author | Tofu Buzzard <no-email> | 2011-02-10 09:53:10 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-10 09:53:10 -0800 |
| commit | 3738cf241ab547e93c0cd9f0c0250502d93c9092 (patch) | |
| tree | deae8e6225a3746e68676bc3f821ef38dad169fb /indra/test_apps | |
| parent | c213618b53d3a18c12afe21d4327d7d86095feaa (diff) | |
| parent | e3ed1565f8c6eeff5d87f862465038aa98576fa9 (diff) | |
merge
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 |