summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-11-09 11:31:32 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2013-11-09 11:31:32 +0000
commit4af21580297dd85727ffdc5d4eee89ad58ead271 (patch)
tree74618b6018e557adf1273971800cf9676098fe5f /indra/newview/llpreviewscript.cpp
parentc8b8c29371a0eb4d53537030d0b007afcc500b3d (diff)
Adding method to load cached/default syntax file and method to access sKeyWordsXML.
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rwxr-xr-xindra/newview/llpreviewscript.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 5f23249c8d..705872328a 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -406,11 +406,7 @@ BOOL LLScriptEdCore::postBuild()
initMenu();
-// Make this work ;-)
- mSyntaxIdLSL.initialise();
- // ...
- mEditor->mKeywords.initialise(LL_PATH_APP_SETTINGS, "keywords_lsl_default.xml");
-// mEditor->mKeywords.initialise(mSyntaxIdLSL.getFullFileSpec());
+ LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLScriptEdCore::initKeywords(), this));
// FIX: Refactor LLTextEditor::loadKeywords so these can be removed.
std::vector<std::string> funcs;
@@ -456,6 +452,15 @@ BOOL LLScriptEdCore::postBuild()
return TRUE;
}
+void LLScriptEdCore::initKeywords()
+{
+ // Make this work ;-)
+ mSyntaxIdLSL.initialise();
+ // ...
+ mEditor->mKeywords.initialise(LL_PATH_APP_SETTINGS, "keywords_lsl_default.xml");
+ // mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
+}
+
void LLScriptEdCore::initMenu()
{
// *TODO: Skinning - make these callbacks data driven