diff options
author | callum_linden <none@none> | 2015-05-18 12:00:36 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-05-18 12:00:36 -0700 |
commit | 80aa29eaec78d267b4fa1822cfbd3a33b268066a (patch) | |
tree | 1ce0483bd490750e367bfe53a19ec312cdc0bd27 /indra/test | |
parent | d214c2854110520d5574f675bcc12f64bfd42090 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
Merge with Viewer Release (after Viewer Release updated with Viewer Tools Update)
Diffstat (limited to 'indra/test')
-rwxr-xr-x | indra/test/llmessageconfig_tut.cpp | 2 | ||||
-rwxr-xr-x | indra/test/message_tut.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp index 8088ce8558..df2151b1b1 100755 --- a/indra/test/llmessageconfig_tut.cpp +++ b/indra/test/llmessageconfig_tut.cpp @@ -68,7 +68,7 @@ namespace tut void writeConfigFile(const LLSD& config) { - llofstream file((mTestConfigDir + "/message.xml")); + llofstream file((mTestConfigDir + "/message.xml").c_str()); if (file.is_open()) { LLSDSerialize::toPrettyXML(config, file); diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp index 57e423e550..aa23699de0 100755 --- a/indra/test/message_tut.cpp +++ b/indra/test/message_tut.cpp @@ -119,9 +119,8 @@ namespace tut void writeConfigFile(const LLSD& config) { - std::ostringstream ostr; - ostr << mTestConfigDir << mSep << "message.xml"; - llofstream file(ostr.str()); + std::string ostr(mTestConfigDir + mSep + "message.xml"); + llofstream file(ostr.c_str()); if (file.is_open()) { LLSDSerialize::toPrettyXML(config, file); |