From 3e0bbc751247cbdbbf123701e258612c8ed5c1b7 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Wed, 23 Sep 2026 22:50:20 +0300
Subject: Add Luau license to About info

---
 scripts/packages-formatter.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'scripts')

diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py
index 5d31702e76..549f1a705d 100755
--- a/scripts/packages-formatter.py
+++ b/scripts/packages-formatter.py
@@ -122,6 +122,9 @@ if any(pkgs for pkgs in list(dups.values())):
 
 print("%s %s" % (args.channel, args.version))
 print(viewer_copyright)
+# Luau is server-side and isn't listed in the viewer's autobuild packages.
+with open(os.path.join(os.path.dirname(__file__), "..", "indra", "newview", "luau.txt"), encoding="utf-8") as luau_license:
+    print("Luau " + " / ".join(line.strip() for line in luau_license if line.startswith("Copyright")))
 version = list(info['versions'].items())
 version.sort()
 for pkg, pkg_version in version:
-- 
cgit v1.3


From 818c337afa685221611a1beb67ca171437c6ec1d Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 24 Sep 2026 00:49:40 +0300
Subject: Fix Luau license packaging and formatting

---
 indra/cmake/BuildPackagesInfo.cmake | 2 +-
 indra/newview/viewer_manifest.py    | 3 +++
 scripts/packages-formatter.py       | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts')

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")
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py
index 549f1a705d..340792158e 100755
--- a/scripts/packages-formatter.py
+++ b/scripts/packages-formatter.py
@@ -125,6 +125,7 @@ print(viewer_copyright)
 # Luau is server-side and isn't listed in the viewer's autobuild packages.
 with open(os.path.join(os.path.dirname(__file__), "..", "indra", "newview", "luau.txt"), encoding="utf-8") as luau_license:
     print("Luau " + " / ".join(line.strip() for line in luau_license if line.startswith("Copyright")))
+print()
 version = list(info['versions'].items())
 version.sort()
 for pkg, pkg_version in version:
-- 
cgit v1.3