diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/LSLDefinitions.cmake | 4 | ||||
| -rw-r--r-- | indra/newview/llsyntaxid.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/LSLDefinitions.cmake b/indra/cmake/LSLDefinitions.cmake index ae0eeebb7e..1a9a477118 100644 --- a/indra/cmake/LSLDefinitions.cmake +++ b/indra/cmake/LSLDefinitions.cmake @@ -3,7 +3,7 @@ include(Prebuilt) use_prebuilt_binary(lsl_definitions) -configure_file("${AUTOBUILD_INSTALL_DIR}/lsl_definitions/lsl_keywords_pretty.xml" +configure_file("${AUTOBUILD_INSTALL_DIR}/lsl_definitions/lsl_keywords.xml" "${CMAKE_SOURCE_DIR}/newview/app_settings/keywords_lsl_default.xml" COPYONLY) -configure_file("${AUTOBUILD_INSTALL_DIR}/lsl_definitions/slua_keywords_pretty.xml" +configure_file("${AUTOBUILD_INSTALL_DIR}/lsl_definitions/lua_keywords.xml" "${CMAKE_SOURCE_DIR}/newview/app_settings/keywords_lua_default.xml" COPYONLY) diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp index 6670809c85..9c1a0ef403 100644 --- a/indra/newview/llsyntaxid.cpp +++ b/indra/newview/llsyntaxid.cpp @@ -45,7 +45,7 @@ namespace const std::string SYNTAX_DEF_CAPABILITY_NAME = "ScriptDefinitions"; const std::string SYNTAX_ID_SIMULATOR_FEATURE = "LSLSyntaxId"; const std::string FILENAME_INTERNAL_LSL = "lsl_keywords.xml"; - const std::string FILENAME_INTERNAL_LUA = "slua_keywords.xml"; + const std::string FILENAME_INTERNAL_LUA = "lua_keywords.xml"; constexpr U32 LLSD_SYNTAX_LSL_VERSION_EXPECTED = 2; const std::string LLSD_SYNTAX_LSL_VERSION_KEY("llsd-lsl-syntax-version"); |