diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-12-10 14:29:45 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-12-10 14:29:45 -0500 |
| commit | 99d757e04152a291ca14c8cb432597de8f2b61e2 (patch) | |
| tree | 81e81758e545409c45c8321836ebf27ee21383c8 | |
| parent | e85cf743e51e93379f7f7afd04cdcd4b9e6b01c1 (diff) | |
| parent | 33cd0bfdfbe07495342da262e6e31d349ec5892e (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -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 30d338292e..d183aac208 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -1537,7 +1537,7 @@ void LLMediaPluginTest::addMediaPanel( std::string url ) char cwd[ FILENAME_MAX ]; if (NULL == getcwd( cwd, FILENAME_MAX - 1 )) { - std::cerr << "Couldn't get cwd - probably too long - failing to init." << llendl; + std::cerr << "Couldn't get cwd - probably too long - failing to init." << std::endl; return; } std::string user_data_path = std::string( cwd ) + "/"; @@ -1774,7 +1774,7 @@ void LLMediaPluginTest::replaceMediaPanel( mediaPanel* panel, std::string url ) char cwd[ FILENAME_MAX ]; if (NULL == getcwd( cwd, FILENAME_MAX - 1 )) { - std::cerr << "Couldn't get cwd - probably too long - failing to init." << llendl; + std::cerr << "Couldn't get cwd - probably too long - failing to init." << std::endl; return; } std::string user_data_path = std::string( cwd ) + "/"; |