aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/test/llmessageconfig_tut.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/test/llmessageconfig_tut.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/test/llmessageconfig_tut.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/test/llmessageconfig_tut.cpp b/linden/indra/test/llmessageconfig_tut.cpp
index 869070e..1f71d5f 100644
--- a/linden/indra/test/llmessageconfig_tut.cpp
+++ b/linden/indra/test/llmessageconfig_tut.cpp
@@ -56,7 +56,7 @@ namespace tut
56 oStr << "/tmp/llmessage-config-test-" << random; 56 oStr << "/tmp/llmessage-config-test-" << random;
57#endif 57#endif
58 mTestConfigDir = oStr.str(); 58 mTestConfigDir = oStr.str();
59 LLFile::mkdir(mTestConfigDir.c_str()); 59 LLFile::mkdir(mTestConfigDir);
60 writeConfigFile(LLSD()); 60 writeConfigFile(LLSD());
61 LLMessageConfig::initClass("simulator", mTestConfigDir); 61 LLMessageConfig::initClass("simulator", mTestConfigDir);
62 } 62 }
@@ -64,16 +64,16 @@ namespace tut
64 ~LLMessageConfigTestData() 64 ~LLMessageConfigTestData()
65 { 65 {
66 // rm contents of temp dir 66 // rm contents of temp dir
67 int rmfile = LLFile::remove((mTestConfigDir + "/message.xml").c_str()); 67 int rmfile = LLFile::remove((mTestConfigDir + "/message.xml"));
68 ensure_equals("rmfile value", rmfile, 0); 68 ensure_equals("rmfile value", rmfile, 0);
69 // rm temp dir 69 // rm temp dir
70 int rmdir = LLFile::rmdir(mTestConfigDir.c_str()); 70 int rmdir = LLFile::rmdir(mTestConfigDir);
71 ensure_equals("rmdir value", rmdir, 0); 71 ensure_equals("rmdir value", rmdir, 0);
72 } 72 }
73 73
74 void writeConfigFile(const LLSD& config) 74 void writeConfigFile(const LLSD& config)
75 { 75 {
76 llofstream file((mTestConfigDir + "/message.xml").c_str()); 76 llofstream file((mTestConfigDir + "/message.xml"));
77 if (file.is_open()) 77 if (file.is_open())
78 { 78 {
79 LLSDSerialize::toPrettyXML(config, file); 79 LLSDSerialize::toPrettyXML(config, file);