summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llsyntaxid.cpp13
-rw-r--r--indra/newview/llsyntaxid.h2
2 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index d54cc06490..f868d82f11 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -248,12 +248,12 @@ void LLSyntaxIdLSL::initialise()
LL_INFOS("SyntaxLSL")
<< "File is cached, no need to download!"
<< LL_ENDL;
- loadKeywordsIntoLLSD();
+ sLoaded = loadKeywordsIntoLLSD();
}
}
else
{ // Need to open the default
- loadDefaultKeywordsIntoLLSD("LSLSyntaxId is null so we will use the default file!");
+ loadDefaultKeywordsIntoLLSD();
}
}
else if (sKeywordsXml.isDefined())
@@ -264,7 +264,7 @@ void LLSyntaxIdLSL::initialise()
}
else
{ // Need to open the default
- loadDefaultKeywordsIntoLLSD("LSLSyntaxId is null so we will use the default file!");
+ loadDefaultKeywordsIntoLLSD();
}
mFileNameCurrent = mFileNameNew;
@@ -305,12 +305,13 @@ bool LLSyntaxIdLSL::isSupportedVersion(const LLSD& content)
//-----------------------------------------------------------------------------
// loadDefaultKeywordsIntoLLSD()
//-----------------------------------------------------------------------------
-void LLSyntaxIdLSL::loadDefaultKeywordsIntoLLSD(const std::string message)
+void LLSyntaxIdLSL::loadDefaultKeywordsIntoLLSD()
{
- LL_INFOS("SyntaxLSL") << message << LL_ENDL;
+ LL_INFOS("SyntaxLSL")
+ << "LSLSyntaxId is null so we will use the default file!" << LL_ENDL;
mSyntaxIdNew = LLUUID();
buildFullFileSpec();
- loadKeywordsIntoLLSD();
+ sLoaded = loadKeywordsIntoLLSD();
}
//-----------------------------------------------------------------------------
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index 824454f9a1..78ea98e3cf 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -89,7 +89,7 @@ protected:
std::string buildFileNameNew();
std::string buildFullFileSpec();
void fetchKeywordsFile();
- void loadDefaultKeywordsIntoLLSD(const std::string message);
+ void loadDefaultKeywordsIntoLLSD();
bool loadKeywordsIntoLLSD();
void setSyntaxId(LLUUID SyntaxId) { mSyntaxIdCurrent = SyntaxId; }
void setFileNameCurrent(std::string& name) { mFileNameCurrent = name; }