summaryrefslogtreecommitdiff
path: root/indra/test_apps
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-14 10:39:59 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-14 10:39:59 -0500
commitaad8d99af2b4a29d055dccb1c3fbea7a46fcb843 (patch)
tree96b398bd405344f42753e58afbb02092882715cb /indra/test_apps
parent3e75137f26c099185677e1160570860e07a56595 (diff)
parenta763409647a5a8d82f2f1c54223b998877c3b72d (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/test_apps')
-rw-r--r--indra/test_apps/llplugintest/llmediaplugintest.cpp4
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 ) + "/";