diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsyntaxid.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llsyntaxid.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp index 0ded401d3e..ad10cee3dd 100644 --- a/indra/newview/llsyntaxid.cpp +++ b/indra/newview/llsyntaxid.cpp @@ -35,6 +35,7 @@ #include "llviewerregion.h" #include "llcorehttputil.h" + //----------------------------------------------------------------------------- // LLSyntaxIdLSL //----------------------------------------------------------------------------- @@ -226,7 +227,7 @@ void LLSyntaxDefCache::fetchKeywordsFileCoro(std::string url, LLUUID syntax_id) // to the default versions, so below, where we get the path to the lua keywords // well be loading the default version. buildDefaultCache(); - + // The LSL keywords we just received std::string full_path = gDirUtilp->add(path, FILENAME_INTERNAL_LSL); if (writeCacheFile(full_path, result)) diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h index b38d02c10f..acf8020d58 100644 --- a/indra/newview/llsyntaxid.h +++ b/indra/newview/llsyntaxid.h @@ -25,8 +25,7 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ -#ifndef LL_SYNTAXID_H -#define LL_SYNTAXID_H +#pragma once #include "llviewerprecompiledheaders.h" @@ -122,7 +121,7 @@ private: static bool isSupportedVersion(const LLSD& content); void handleRegionChanged(); void handleCapsReceived(const LLUUID& region_uuid); - void setKeywords(const LLSD& lsl, const LLSD& lua) { mLSLKeywords = lsl; mLuaKeywords = lua; }; + void setKeywords(const LLSD& lsl, const LLSD& lua) { mLSLKeywords = lsl; mLuaKeywords = lua; }; void loadKeywordsIntoLLSD(); @@ -148,5 +147,3 @@ private: LLSD mLuaKeywords; bool mUseDefsCap{ false }; }; - -#endif // LLSYNTAXID_H |