diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:27:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:27:08 -0500 |
| commit | ed73c8bf6357ca1e1a8009ead6b3b664e25c29c9 (patch) | |
| tree | 36a9cb02c09caed35696d35686948190b697cb7a /indra/test_apps | |
| parent | 2e7461277801dc0daa1e9ea509e079c980045f42 (diff) | |
| parent | 4c343c4506604b8dd0ac2d99a2b9661a1d382fc7 (diff) | |
pull latest changes from viewer-vs2010
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 |