diff options
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/types_lua_default.xml (renamed from indra/newview/app_settings/types_lua_default.llsd) | 0 | ||||
| -rw-r--r-- | indra/newview/llscripteditorws.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llsyntaxid.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 702a738e57..87e350a69d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1674,7 +1674,7 @@ set(viewer_APPSETTINGS_FILES app_settings/std_bump.ini app_settings/toolbars.xml app_settings/trees.xml - app_settings/types_lua_default.llsd + app_settings/types_lua_default.xml app_settings/viewerart.xml app_settings/message.xml ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg diff --git a/indra/newview/app_settings/types_lua_default.llsd b/indra/newview/app_settings/types_lua_default.xml index 5881df5ba5..5881df5ba5 100644 --- a/indra/newview/app_settings/types_lua_default.llsd +++ b/indra/newview/app_settings/types_lua_default.xml diff --git a/indra/newview/llscripteditorws.cpp b/indra/newview/llscripteditorws.cpp index cecac23383..814157e86c 100644 --- a/indra/newview/llscripteditorws.cpp +++ b/indra/newview/llscripteditorws.cpp @@ -334,12 +334,12 @@ LLSD LLScriptEditorWSServer::handleSyntaxRequest(const LLSD& params) const if (category == "defs.lua") { response["defs"] = LLSyntaxLua::instance().getTypesXML(); - response["success"] = true; + response["success"] = response["defs"].isDefined(); } else if (category == "defs.lsl") { response["defs"] = LLSyntaxIdLSL::instance().getKeywordsXML(); - response["success"] = true; + response["success"] = response["defs"].isDefined(); } else { diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp index a891bf945e..bca3f0abc8 100644 --- a/indra/newview/llsyntaxid.cpp +++ b/indra/newview/llsyntaxid.cpp @@ -364,7 +364,7 @@ void LLSyntaxLua::loadDefaultKeywordsIntoLLSD() void LLSyntaxLua::loadLuaTypesIntoLLSD() { - std::string fullFileSpec = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "types_lua_default.llsd"); + std::string fullFileSpec = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "types_lua_default.xml"); llifstream file(fullFileSpec.c_str()); if (file.good()) |