diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-22 22:41:08 +0100 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-10-22 22:41:08 +0100 |
| commit | dfa8a78c2895e16a4887786d522a70cae59b081e (patch) | |
| tree | 093378b243cb72e68e317d9e2e45a738a43e8962 /indra/newview/llsyntaxid.cpp | |
| parent | a0607d45ca12c930b9fb8018243e62aed0e09dc9 (diff) | |
STORM-1831 Style cleanup/fixes
Diffstat (limited to 'indra/newview/llsyntaxid.cpp')
| -rw-r--r-- | indra/newview/llsyntaxid.cpp | 20 |
1 files changed, 14 insertions, 6 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(); } } |