summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llsyntaxid.cpp20
-rw-r--r--indra/newview/llsyntaxid.h5
2 files changed, 17 insertions, 8 deletions
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 9ecbe8698d..deaa64c0e7 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -121,7 +121,9 @@ bool LLSyntaxIdLSL::checkSyntaxIdChange()
<< mRegion->getName()
<< "' has not received capabilities yet! Setting a callback for when they arrive."
<< LL_ENDL;
- } else {
+ }
+ else
+ {
// get and check the hash
LLSD simFeatures;
mRegion->getSimulatorFeatures(simFeatures);
@@ -144,7 +146,9 @@ bool LLSyntaxIdLSL::checkSyntaxIdChange()
<< LL_ENDL;
changed = true;
- } else {
+ }
+ else
+ {
LL_WARNS("LSLSyntax")
<< "Region changed to '"
<< mRegion->getName()
@@ -153,14 +157,18 @@ bool LLSyntaxIdLSL::checkSyntaxIdChange()
<< "'"
<< LL_ENDL;
}
- } else {
+ }
+ else
+ {
// Set the hash to NULL_KEY to indicate use of default keywords file
if ( mCurrentSyntaxId.isNull() )
{
LL_WARNS("LSLSyntax")
<< "Region does not have LSLSyntaxId capability, remaining with default keywords file!"
<< LL_ENDL;
- } else {
+ }
+ else
+ {
mCurrentSyntaxId = LLUUID();
mFilenameCurrent = mFilenameDefault;
mFilenameLocation = LL_PATH_APP_SETTINGS;
@@ -187,7 +195,7 @@ bool LLSyntaxIdLSL::fetchKeywordsFile()
// mResponder->setFileSpec(mFilenameSpec);
if ( !cap_url.empty() )
{
- LLHTTPClient::get(cap_url, mResponder);
+ LLHTTPClient::get(cap_url, new fetchKeywordsFileResponder(mFilenameSpec));
}
return fetched;
@@ -207,7 +215,7 @@ void LLSyntaxIdLSL::initialise()
bool success = true;
if (!gDirUtilp->fileExists(mFilenameSpec))
{
- mResponder = new fetchKeywordsFileResponder(mFilenameSpec);
+ //mResponder = new fetchKeywordsFileResponder(mFilenameSpec);
success = fetchKeywordsFile();
}
}
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index 6e5a97fd31..e32fcf209e 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -33,7 +33,7 @@ public:
std::string filenameCurrent() { return mFilenameCurrent; }
ELLPath filenamePath() { return mFilenameLocation; }
void initialise();
- static void setKeywordsXml(LLSD& content) { LLSyntaxIdLSL::mKeywordsXml = content; }
+ static void setKeywordsXml(const LLSD& content) { LLSyntaxIdLSL::sKeywordsXml = content; }
protected:
std::string buildFilename(LLUUID& SyntaxId);
@@ -60,6 +60,7 @@ private:
std::string mFilenameFull;
ELLPath mFilenameLocation;
std::string mFilenameSpec;
- static LLSD mKeywordsXml;
std::string mSimulatorFeature;
+
+ static LLSD sKeywordsXml;
};