From b82f52acbb00a9dd3e5426e8a6510a0ef6f41289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kyler=20=22F=C3=A9lix=22=20Eastridge?= Date: Mon, 28 Jul 2025 03:06:43 +0100 Subject: Remove the first login screen (#4451) * Remove panel_login_first.xml and it's components * Remove additional first login panel resources * Remove redundant comment * Remove *.jpg search from viewer manifest --- indra/newview/viewer_manifest.py | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index cada4a2cd6..f66a5c0945 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -149,7 +149,6 @@ class ViewerManifest(LLManifest): with self.prefix(src_dst="skins"): # include the entire textures directory recursively with self.prefix(src_dst="*/textures"): - self.path("*/*.jpg") self.path("*/*.png") self.path("*.tga") self.path("*.j2c") -- cgit v1.2.3 From 61d53a8731a0d10e94c4c366c31598b3f12198e1 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 4 Aug 2025 22:40:13 +0300 Subject: #4470 Plug in Discord SDK package --- indra/newview/viewer_manifest.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f66a5c0945..4760ba5a6f 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -556,6 +556,9 @@ class Windows_x86_64_Manifest(ViewerManifest): ): self.path(libfile) + if self.args['discord'] == 'ON': + self.path("discord_partner_sdk.dll") + if self.args['openal'] == 'ON': # Get openal dll self.path("OpenAL32.dll") @@ -1018,6 +1021,13 @@ class Darwin_x86_64_Manifest(ViewerManifest): ): self.path2basename(relpkgdir, libfile) + # Discord social SDK + if self.args['DISCORD'] == 'ON': + for libfile in ( + "libdiscord_partner_sdk.dylib", + ): + self.path2basename(relpkgdir, libfile) + # OpenAL dylibs if self.args['openal'] == 'ON': for libfile in ( @@ -1384,6 +1394,7 @@ if __name__ == "__main__": extra_arguments = [ dict(name='bugsplat', description="""BugSplat database to which to post crashes, if BugSplat crash reporting is desired""", default=''), + dict(name='discord', description="""Indication discord social sdk libraries are needed""", default='OFF'), dict(name='openal', description="""Indication openal libraries are needed""", default='OFF'), dict(name='tracy', description="""Indication tracy profiler is enabled""", default='OFF'), ] -- cgit v1.2.3 From c26749750998c2efaa5208b83bc48d65dfa60274 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 5 Aug 2025 09:33:19 +0300 Subject: #4470 Adjustments and Mac build fixes --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4760ba5a6f..04c3fea93a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1022,7 +1022,7 @@ class Darwin_x86_64_Manifest(ViewerManifest): self.path2basename(relpkgdir, libfile) # Discord social SDK - if self.args['DISCORD'] == 'ON': + if self.args['discord'] == 'ON': for libfile in ( "libdiscord_partner_sdk.dylib", ): -- cgit v1.2.3