summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-11-11 16:34:16 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2013-11-11 16:34:16 +0000
commit377eb5561f885902585830226fd82c4ceeec4e05 (patch)
tree4736e0ce2134ef26c165a64fbf216661e7307772
parent3e41917403fb3519adac2343ca21a1f289596621 (diff)
Renaming initKeywords to better reflect its intended use (onRegionChangeInitialiseKeywords)
-rwxr-xr-xindra/newview/llpreviewscript.cpp8
-rwxr-xr-xindra/newview/llpreviewscript.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 34ad95e228..19aab8f383 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -34,6 +34,7 @@
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "lldir.h"
+#include "llenvmanager.h"
#include "llexternaleditor.h"
#include "llfilepicker.h"
#include "llfloaterreg.h"
@@ -406,13 +407,14 @@ BOOL LLScriptEdCore::postBuild()
initMenu();
- initKeywords();
-
+ onRegionChangeInitialiseKeywords();
+ //LLEnvManagerNew::getInstance()->setRegionChangeCallback(boost::bind(&LLScriptEdCore::onRegionChangeInitialiseKeywords(), this));
return TRUE;
}
-void LLScriptEdCore::initKeywords()
+void LLScriptEdCore::onRegionChangeInitialiseKeywords()
{
+ mEditor->mKeywords.clearLoaded();
mSyntaxIdLSL.initialise();
mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 149c27461e..2dd5a1b6a7 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -78,7 +78,7 @@ public:
~LLScriptEdCore();
void initMenu();
- void initKeywords();
+ void onRegionChangeInitialiseKeywords();
virtual void draw();
/*virtual*/ BOOL postBuild();