From bea2e9822b52b66e3644925143b852526c669248 Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Sat, 9 Nov 2013 11:51:45 +0000
Subject: [PATCH] Fixing some references to 'filename' I forgot to rename to
mFullFileSpec.
---
doc/contributions.txt | 3 ++-
indra/newview/llsyntaxid.cpp | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 4ce074506bd..03f0194a47e 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -514,7 +514,8 @@ Ima Mechanique
VWR-10791
VWR-20553
VWR-19213
- VWR-23739
+ VWR-22401
+ VWR-23739
VWR-24766
VWR-28065
Imnotgoing Sideways
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 00e60865465..c5960fb16ef 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -293,7 +293,7 @@ bool LLSyntaxIdLSL::loadKeywordsFileIntoLLSD()
loaded = (bool)LLSDSerialize::fromXML(content, file);
if (!loaded)
{
- LL_WARNS("LSLSyntax") << "Unable to deserialise file: " << filename << LL_ENDL;
+ LL_WARNS("LSLSyntax") << "Unable to deserialise file: " << mFullFileSpec << LL_ENDL;
// Is this the right thing to do, or should we leave the old content
// even if it isn't entirely accurate anymore?
@@ -302,12 +302,12 @@ bool LLSyntaxIdLSL::loadKeywordsFileIntoLLSD()
else
{
sKeywordsXml = content;
- LL_INFOS("LSLSyntax") << "Deserialised file: " << filename << LL_ENDL;
+ LL_INFOS("LSLSyntax") << "Deserialised file: " << mFullFileSpec << LL_ENDL;
}
}
else
{
- LL_WARNS("LSLSyntax") << "Unable to open file: " << filename << LL_ENDL;
+ LL_WARNS("LSLSyntax") << "Unable to open file: " << mFullFileSpec << LL_ENDL;
}
return loaded;
}
--
GitLab