diff options
| author | Alain Linden <alain@lindenlab.com> | 2011-03-03 13:56:43 -0800 |
|---|---|---|
| committer | Alain Linden <alain@lindenlab.com> | 2011-03-03 13:56:43 -0800 |
| commit | ba1d1267fe2214198b36b5ed130a9a4ae5c5fb3f (patch) | |
| tree | 5e647d28eaeed51872ff9ca65536aeb2ce90535a /indra/test_apps | |
| parent | 0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff) | |
| parent | d0ed06ffcae08a11ee8b5ff35692b25b5cbbb48a (diff) | |
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/test_apps')
| -rw-r--r-- | indra/test_apps/llplugintest/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index d6203ea026..1211bb7e5a 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -1,5 +1,4 @@ # -*- cmake -*- - project(llplugintest) include(00-Common) 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 |