diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-24 16:12:36 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-24 16:12:36 +0800 |
| commit | f23f30b19df8976908886de492df2fcba3b8c14a (patch) | |
| tree | d2f39faae40cafa9cacc7ca9bdb2437eddd0e3f3 /indra | |
| parent | 9bc0d85ab9259181322c6ecf502534f61d283cb9 (diff) | |
| parent | 818c337afa685221611a1beb67ca171437c6ec1d (diff) | |
Merge tag 'Second_Life_Release#818c337-26.4' into 26.4
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/BuildPackagesInfo.cmake | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake index ee50a21e18..9a615ad3cd 100644 --- a/indra/cmake/BuildPackagesInfo.cmake +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -15,7 +15,7 @@ add_custom_command(OUTPUT packages-info.txt ${CMAKE_SOURCE_DIR}/newview/luau.txt ${CMAKE_SOURCE_DIR}/../autobuild.xml COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE} -DAUTOBUILD=${AUTOBUILD_EXECUTABLE} + ${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE} -DAUTOBUILD=${AUTOBUILD_EXECUTABLE} -DPYTHONIOENCODING=utf-8 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py "${VIEWER_CHANNEL}" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" "${AUTOBUILD_INSTALL_DIR}" > packages-info.txt ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 326b3adaaf..f451b28475 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -143,6 +143,9 @@ class ViewerManifest(LLManifest): "settings_install.xml", src="environment") + # Include the full Luau license in the packaged viewer. + with self.prefix(src=pkgdir): + self.path("LICENSES/luau.txt") with self.prefix(src_dst="character"): self.path("*.llm") |