summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-11-09 11:32:08 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2013-11-09 11:32:08 +0000
commit29b2129e1eec0dbbb909422e82766a58f14c5da3 (patch)
treebadfc7eb2691cfa597c79be608c529ef84b5768a /indra/newview/llpreviewscript.cpp
parent4af21580297dd85727ffdc5d4eee89ad58ead271 (diff)
Backed out changeset: e82d9467bec8
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rwxr-xr-xindra/newview/llpreviewscript.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 705872328a..5f23249c8d 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -406,7 +406,11 @@ BOOL LLScriptEdCore::postBuild()
initMenu();
- LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLScriptEdCore::initKeywords(), this));
+// Make this work ;-)
+ mSyntaxIdLSL.initialise();
+ // ...
+ mEditor->mKeywords.initialise(LL_PATH_APP_SETTINGS, "keywords_lsl_default.xml");
+// mEditor->mKeywords.initialise(mSyntaxIdLSL.getFullFileSpec());
// FIX: Refactor LLTextEditor::loadKeywords so these can be removed.
std::vector<std::string> funcs;
@@ -452,15 +456,6 @@ 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