diff options
| author | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
| commit | 13c391f1984bb8cb9d67a7729af2ee5714409215 (patch) | |
| tree | 112edff1d25adabb4893e6746ba76a4182865f8a /indra/llmessage/llmessageconfig.cpp | |
| parent | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (diff) | |
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
Diffstat (limited to 'indra/llmessage/llmessageconfig.cpp')
| -rw-r--r-- | indra/llmessage/llmessageconfig.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llmessage/llmessageconfig.cpp b/indra/llmessage/llmessageconfig.cpp index bfaec7c8fc..7e7d956abf 100644 --- a/indra/llmessage/llmessageconfig.cpp +++ b/indra/llmessage/llmessageconfig.cpp @@ -30,10 +30,10 @@ class LLMessageConfigFile : public LLLiveFile { public: LLMessageConfigFile() - : LLLiveFile(fileName(), messageConfigRefreshRate) + : LLLiveFile(filename(), messageConfigRefreshRate) { } - static std::string fileName(); + static std::string filename(); LLSD mMessages; std::string mServerDefault; @@ -52,7 +52,7 @@ public: LLSD mCapBans; }; -std::string LLMessageConfigFile::fileName() +std::string LLMessageConfigFile::filename() { std::ostringstream ostr; ostr << sConfigDir//gAppSimp->getOption("configdir").asString() @@ -73,9 +73,10 @@ void LLMessageConfigFile::loadFile() LLSD data; { llifstream file(filename().c_str()); + if (file.is_open()) { - llinfos << "Loading message.xml file at " << fileName() << llendl; + llinfos << "Loading message.xml file at " << filename() << llendl; LLSDSerialize::fromXML(data, file); } |