summaryrefslogtreecommitdiff
path: root/indra/llmessage/llmessageconfig.cpp
diff options
context:
space:
mode:
authorBrett Joseph <bjoseph@vivox.com>2015-05-11 09:52:18 -0400
committerBrett Joseph <bjoseph@vivox.com>2015-05-11 09:52:18 -0400
commit43b7fe66db159faaa84d545f97818e7a6f0f6920 (patch)
tree6581ed36e716f6aa57b01f2861d6812294fb2261 /indra/llmessage/llmessageconfig.cpp
parent7cc3e9b3cf8d70fce2ba0d4a398824e599fc8c5d (diff)
parente611e35e033e99f619b0e4938f6879c8e387efd5 (diff)
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/llmessage/llmessageconfig.cpp')
-rwxr-xr-xindra/llmessage/llmessageconfig.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llmessageconfig.cpp b/indra/llmessage/llmessageconfig.cpp
index f8b2c8f5a6..64e79d6767 100755
--- a/indra/llmessage/llmessageconfig.cpp
+++ b/indra/llmessage/llmessageconfig.cpp
@@ -96,7 +96,7 @@ bool LLMessageConfigFile::loadFile()
{
LLSD data;
{
- llifstream file(filename());
+ llifstream file(filename().c_str());
if (file.is_open())
{