Merge branch 'master' of https://git.alchemyviewer.org/alchemy/alchemy

.gitlab-ci.yml

@@ -20,7 +20,7 @@ variables:
       }
     - pipenv run autobuild configure -c ReleaseOS -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON
     - pipenv run autobuild build -c ReleaseOS --no-configure
-    - If ($env:VIEWER_USE_CRASHPAD) {
+    - If ($env:VIEWER_USE_CRASHPAD -eq 'TRUE') {
     - Push-Location .\build-vc-*\newview\Release\
     - sentry-cli upload-dif --include-sources alchemy-bin.exe alchemy-bin.pdb crashpad_handler.exe crashpad_handler.pdb openjpeg.pdb openjpeg.dll fmod.dll libcrypto-1_1.dll libcrypto-1_1.pdb libssl-1_1.dll libssl-1_1.pdb libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll nghttp2.dll glod.dll
     - Pop-Location }

indra/llcommon/lluuid.cpp

@@ -153,8 +153,7 @@ U32 janky_fast_random_seeded_bytes(U32 seed, U32 val)
 // Common to all UUID implementations
 void LLUUID::toString(std::string& out) const
 {
-	out = fmt::format(
-		fmt("{:02x}{:02x}{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}"),
+	out = fmt::format(FMT_STRING("{:02x}{:02x}{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}"),
 		(U8)(mData[0]),
 		(U8)(mData[1]),
 		(U8)(mData[2]),

indra/newview/llfloaterpreference.cpp

@@ -184,7 +184,7 @@ public:
 	void setParent(LLFloaterPreference* parent) { mParent = parent; }
 	
 	BOOL handleKeyHere(KEY key, MASK mask) override;
-	BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down);
+	BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down) override;
 	static void onCancel(void* user_data);
 		
 private:

indra/newview/viewer_manifest.py

@@ -870,16 +870,10 @@ class DarwinManifest(ViewerManifest):
                         self.path("*.png")
                         self.path("*.gif")
 
-                with self.prefix(src=relpkgdir, dst=""):
-                    self.path("libndofdev.dylib")
-                    self.path("libhunspell-1.3.a")   
-
                 with self.prefix(src_dst="cursors_mac"):
                     self.path("*.tif")
 
-                self.path("licenses-mac.txt", dst="licenses.txt")
                 self.path("featuretable_mac.txt")
-                self.path("Alchemy.nib")
 
                 with self.prefix(src=pkgdir,dst=""):
                     self.path("ca-bundle.crt")
@@ -939,17 +933,11 @@ class DarwinManifest(ViewerManifest):
                 libfile_parent = self.get_dst_prefix()
                 dylibs=[]
                 for libfile in (
-                                "libapr-1.0.dylib",
-                                "libaprutil-1.0.dylib",
-                                "libexpat.1.dylib",
-                                "libexception_handler.dylib",
                                 "libGLOD.dylib",
-                                "libfreetype.*dylib",
                                 "libopenjpeg.dylib",
                                 # libnghttp2.dylib is a symlink to
                                 # libnghttp2.major.dylib, which is a symlink to
                                 # libnghttp2.version.dylib. Get all of them.
-                                "libnghttp2.*dylib",
                                 ):
                     dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile)
 
@@ -1169,16 +1157,16 @@ class DarwinManifest(ViewerManifest):
                         [newpath, self.dst_path_of(dylibexecutable)])
 
                     # copy LibVLC plugin itself
-                    self.path2basename("../media_plugins/libvlc/" + self.args['configuration'],
-                                       "media_plugin_libvlc.dylib")
+                    #self.path2basename("../media_plugins/libvlc/" + self.args['configuration'],
+                    #                   "media_plugin_libvlc.dylib")
 
                     # copy LibVLC dynamic libraries
-                    with self.prefix(src=relpkgdir, dst="lib"):
-                        self.path( "libvlc*.dylib*" )
-                        # copy LibVLC plugins folder
-                        with self.prefix(src='plugins', dst=""):
-                            self.path( "*.dylib" )
-                            self.path( "plugins.dat" )
+                    #with self.prefix(src=relpkgdir, dst="lib"):
+                    #    self.path( "libvlc*.dylib*" )
+                    #    # copy LibVLC plugins folder
+                    #    with self.prefix(src='plugins', dst=""):
+                    #        self.path( "*.dylib" )
+                    #        self.path( "plugins.dat" )
 
     def package_finish(self):
         global CHANNEL_VENDOR_BASE