Merge pull request #5739 from secondlife/rider/defs_cap

Get pregenerated config files from the simulator cap and make them available through the websocket.

1 files changed, 2 insertions, 3 deletions

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index a9e3afbc58..544473ba77 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -507,11 +507,10 @@ bool LLScriptEdCore::postBuild()
 
     initMenu();
 
-    mSyntaxIDConnection = LLSyntaxIdLSL::getInstance()->addSyntaxIDCallback(boost::bind(&LLScriptEdCore::processKeywords, this));
+    mSyntaxIDConnection = LLSyntaxDefCache::getInstance()->addSyntaxIDCallback(boost::bind(&LLScriptEdCore::processKeywords, this));
 
     // Intialise keyword highlighting for the current simulator's version of LSL
-    LLSyntaxIdLSL::getInstance()->initialize();
-    LLSyntaxLua::getInstance()->initialize();
+    LLSyntaxDefCache::getInstance();
     processKeywords();
 
     mCommitCallbackRegistrar.add("FontSize.Set", boost::bind(&LLScriptEdCore::onChangeFontSize, this, _2));