initial Lua types files, and switch websocket server to use a single connection for all scripts.

1 files changed, 16 insertions, 1 deletions

diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 1f8766eea2..a891bf945e 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -343,7 +343,7 @@ void LLSyntaxLua::initialize()
     if (mInitialized) return;
 
     loadDefaultKeywordsIntoLLSD();
-
+    loadLuaTypesIntoLLSD();
     mInitialized = true;
 }
 
@@ -361,3 +361,18 @@ void LLSyntaxLua::loadDefaultKeywordsIntoLLSD()
         }
     }
 }
+
+void LLSyntaxLua::loadLuaTypesIntoLLSD()
+{
+    std::string fullFileSpec = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "types_lua_default.llsd");
+    llifstream  file(fullFileSpec.c_str());
+
+    if (file.good())
+    {
+        LLSD content;
+        if (LLSDSerialize::fromXML(content, file) != LLSDParser::PARSE_FAILURE)
+        {
+            mTypesXml = content;
+        }
+    }
+}