summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCinder <cinder.roxley@phoenixviewer.com>2014-06-20 10:17:31 -0600
committerCinder <cinder.roxley@phoenixviewer.com>2014-06-20 10:17:31 -0600
commitd949bee053610fe8769055589984e721ae1ee3d1 (patch)
treed8376faee8a59db5936bbbb563a20d747dbbcfeb /indra/newview
parent142e8edcd334b6119a74a7ce93c9823ad82bc052 (diff)
BUG-6425 - Init default keywords file during ctor so we have something to fallback on should caps or fetch fail
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llsyntaxid.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 236ad784ec..9b82710161 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -111,6 +111,7 @@ LLSyntaxIdLSL::LLSyntaxIdLSL()
, mFilePath(LL_PATH_APP_SETTINGS)
, mSyntaxId(LLUUID())
{
+ loadDefaultKeywordsIntoLLSD();
mRegionChangedCallback = gAgent.addRegionChangedCallback(boost::bind(&LLSyntaxIdLSL::handleRegionChanged, this));
handleRegionChanged(); // Kick off an initial caps query and fetch
}