summaryrefslogtreecommitdiff
path: root/indra/llmessage/llmessageconfig.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmessage/llmessageconfig.cpp')
-rw-r--r--indra/llmessage/llmessageconfig.cpp9
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);
}