Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 201 insertions, 201 deletions

diff --git a/indra/llfilesystem/lldir_mac.cpp b/indra/llfilesystem/lldir_mac.cpp
index 0d9695e161..06545121b6 100644
--- a/indra/llfilesystem/lldir_mac.cpp
+++ b/indra/llfilesystem/lldir_mac.cpp
@@ -1,201 +1,201 @@
-/** 
- * @file lldir_mac.cpp
- * @brief Implementation of directory utilities for macOS
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */ 
-
-#if LL_DARWIN
-
-#include "linden_common.h"
-
-#include "lldir_mac.h"
-#include "llerror.h"
-#include "llrand.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <glob.h>
-#include <boost/filesystem.hpp>
-#include "lldir_utils_objc.h"
-
-// --------------------------------------------------------------------------------
-
-static bool CreateDirectory(const std::string &parent, 
-                            const std::string &child,
-                            std::string *fullname)
-{
-    
-    boost::filesystem::path p(parent);
-    p /= child;
-    
-    if (fullname)
-        *fullname = std::string(p.string());
-    
-    if (! boost::filesystem::create_directory(p))
-    {
-        return (boost::filesystem::is_directory(p));
-    }
-    return true;
-}
-
-// --------------------------------------------------------------------------------
-
-LLDir_Mac::LLDir_Mac()
-{
-	mDirDelimiter = "/";
-
-    const std::string     secondLifeString = "SecondLife";
-    
-    std::string executablepathstr = getSystemExecutableFolder();
-
-    //NOTE:  LLINFOS/LLERRS will not output to log here.  The streams are not initialized.
-    
-	if (!executablepathstr.empty())
-	{
-		// mExecutablePathAndName
-		mExecutablePathAndName = executablepathstr;
-        
-        boost::filesystem::path executablepath(executablepathstr);
-        
-# ifndef BOOST_SYSTEM_NO_DEPRECATED
-#endif
-        mExecutableFilename = executablepath.filename().string();
-        mExecutableDir = executablepath.parent_path().string();
-		
-		// mAppRODataDir
-        std::string resourcepath = getSystemResourceFolder();
-        mAppRODataDir = resourcepath;
-		
-		// *NOTE: When running in a dev tree, use the copy of
-		// skins in indra/newview/ rather than in the application bundle.  This
-		// mirrors Windows dev environment behavior and allows direct checkin
-		// of edited skins/xui files. JC
-		
-		// MBW -- This keeps the mac application from finding other things.
-		// If this is really for skins, it should JUST apply to skins.
-        
-		std::string::size_type build_dir_pos = mExecutableDir.rfind("/build-darwin-");
-		if (build_dir_pos != std::string::npos)
-		{
-			// ...we're in a dev checkout
-			mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos)
-				+ "/indra/newview/skins";
-			LL_INFOS() << "Running in dev checkout with mSkinBaseDir "
-				<< mSkinBaseDir << LL_ENDL;
-		}
-		else
-		{
-			// ...normal installation running
-			mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
-		}
-		
-		// mOSUserDir
-        std::string appdir = getSystemApplicationSupportFolder();
-        std::string rootdir;
-
-        //Create root directory
-        if (CreateDirectory(appdir, secondLifeString, &rootdir))
-        {
-            
-            // Save the full path to the folder
-            mOSUserDir = rootdir;
-            
-            // Create our sub-dirs
-            CreateDirectory(rootdir, std::string("data"), NULL);
-            CreateDirectory(rootdir, std::string("logs"), NULL);
-            CreateDirectory(rootdir, std::string("user_settings"), NULL);
-            CreateDirectory(rootdir, std::string("browser_profile"), NULL);
-        }
-    
-		//mOSCacheDir
-        std::string cachedir =  getSystemCacheFolder();
-        if (!cachedir.empty())
-		{
-            mOSCacheDir = cachedir;
-            //TODO:  This changes from ~/Library/Cache/Secondlife to ~/Library/Cache/com.app.secondlife/Secondlife.  Last dir level could go away.
-            CreateDirectory(mOSCacheDir, secondLifeString, NULL);
-		}
-		
-		// mOSUserAppDir
-		mOSUserAppDir = mOSUserDir;
-		
-		// mTempDir
-        //Aura 120920 boost::filesystem::temp_directory_path() not yet implemented on mac. :(
-        std::string tmpdir = getSystemTempFolder();
-        if (!tmpdir.empty())
-        {
-            CreateDirectory(tmpdir, secondLifeString, &mTempDir);
-        }
-		
-		mWorkingDir = getCurPath();
-
-		mLLPluginDir = mAppRODataDir + mDirDelimiter + "llplugin";
-	}
-}
-
-LLDir_Mac::~LLDir_Mac()
-{
-}
-
-// Implementation
-
-
-void LLDir_Mac::initAppDirs(const std::string &app_name,
-							const std::string& app_read_only_data_dir)
-{
-	// Allow override so test apps can read newview directory
-	if (!app_read_only_data_dir.empty())
-	{
-		mAppRODataDir = app_read_only_data_dir;
-		mSkinBaseDir = add(mAppRODataDir, "skins");
-	}
-	mCAFile = add(mAppRODataDir, "ca-bundle.crt");
-}
-
-std::string LLDir_Mac::getCurPath()
-{
-	return boost::filesystem::path( boost::filesystem::current_path() ).string();
-}
-
-
-
-bool LLDir_Mac::fileExists(const std::string &filename) const
-{
-    return boost::filesystem::exists(filename);
-}
-
-
-/*virtual*/ std::string LLDir_Mac::getLLPluginLauncher()
-{
-	return gDirUtilp->getAppRODataDir() + gDirUtilp->getDirDelimiter() +
-		"SLPlugin.app/Contents/MacOS/SLPlugin";
-}
-
-/*virtual*/ std::string LLDir_Mac::getLLPluginFilename(std::string base_name)
-{
-	return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() +
-		base_name + ".dylib";
-}
-
-
-#endif // LL_DARWIN
+/**

+ * @file lldir_mac.cpp

+ * @brief Implementation of directory utilities for macOS

+ *

+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ *

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#if LL_DARWIN

+

+#include "linden_common.h"

+

+#include "lldir_mac.h"

+#include "llerror.h"

+#include "llrand.h"

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <unistd.h>

+#include <glob.h>

+#include <boost/filesystem.hpp>

+#include "lldir_utils_objc.h"

+

+// --------------------------------------------------------------------------------

+

+static bool CreateDirectory(const std::string &parent,

+                            const std::string &child,

+                            std::string *fullname)

+{

+

+    boost::filesystem::path p(parent);

+    p /= child;

+

+    if (fullname)

+        *fullname = std::string(p.string());

+

+    if (! boost::filesystem::create_directory(p))

+    {

+        return (boost::filesystem::is_directory(p));

+    }

+    return true;

+}

+

+// --------------------------------------------------------------------------------

+

+LLDir_Mac::LLDir_Mac()

+{

+    mDirDelimiter = "/";

+

+    const std::string     secondLifeString = "SecondLife";

+

+    std::string executablepathstr = getSystemExecutableFolder();

+

+    //NOTE:  LLINFOS/LLERRS will not output to log here.  The streams are not initialized.

+

+    if (!executablepathstr.empty())

+    {

+        // mExecutablePathAndName

+        mExecutablePathAndName = executablepathstr;

+

+        boost::filesystem::path executablepath(executablepathstr);

+

+# ifndef BOOST_SYSTEM_NO_DEPRECATED

+#endif

+        mExecutableFilename = executablepath.filename().string();

+        mExecutableDir = executablepath.parent_path().string();

+

+        // mAppRODataDir

+        std::string resourcepath = getSystemResourceFolder();

+        mAppRODataDir = resourcepath;

+

+        // *NOTE: When running in a dev tree, use the copy of

+        // skins in indra/newview/ rather than in the application bundle.  This

+        // mirrors Windows dev environment behavior and allows direct checkin

+        // of edited skins/xui files. JC

+

+        // MBW -- This keeps the mac application from finding other things.

+        // If this is really for skins, it should JUST apply to skins.

+

+        std::string::size_type build_dir_pos = mExecutableDir.rfind("/build-darwin-");

+        if (build_dir_pos != std::string::npos)

+        {

+            // ...we're in a dev checkout

+            mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos)

+                + "/indra/newview/skins";

+            LL_INFOS() << "Running in dev checkout with mSkinBaseDir "

+                << mSkinBaseDir << LL_ENDL;

+        }

+        else

+        {

+            // ...normal installation running

+            mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";

+        }

+

+        // mOSUserDir

+        std::string appdir = getSystemApplicationSupportFolder();

+        std::string rootdir;

+

+        //Create root directory

+        if (CreateDirectory(appdir, secondLifeString, &rootdir))

+        {

+

+            // Save the full path to the folder

+            mOSUserDir = rootdir;

+

+            // Create our sub-dirs

+            CreateDirectory(rootdir, std::string("data"), NULL);

+            CreateDirectory(rootdir, std::string("logs"), NULL);

+            CreateDirectory(rootdir, std::string("user_settings"), NULL);

+            CreateDirectory(rootdir, std::string("browser_profile"), NULL);

+        }

+

+        //mOSCacheDir

+        std::string cachedir =  getSystemCacheFolder();

+        if (!cachedir.empty())

+        {

+            mOSCacheDir = cachedir;

+            //TODO:  This changes from ~/Library/Cache/Secondlife to ~/Library/Cache/com.app.secondlife/Secondlife.  Last dir level could go away.

+            CreateDirectory(mOSCacheDir, secondLifeString, NULL);

+        }

+

+        // mOSUserAppDir

+        mOSUserAppDir = mOSUserDir;

+

+        // mTempDir

+        //Aura 120920 boost::filesystem::temp_directory_path() not yet implemented on mac. :(

+        std::string tmpdir = getSystemTempFolder();

+        if (!tmpdir.empty())

+        {

+            CreateDirectory(tmpdir, secondLifeString, &mTempDir);

+        }

+

+        mWorkingDir = getCurPath();

+

+        mLLPluginDir = mAppRODataDir + mDirDelimiter + "llplugin";

+    }

+}

+

+LLDir_Mac::~LLDir_Mac()

+{

+}

+

+// Implementation

+

+

+void LLDir_Mac::initAppDirs(const std::string &app_name,

+                            const std::string& app_read_only_data_dir)

+{

+    // Allow override so test apps can read newview directory

+    if (!app_read_only_data_dir.empty())

+    {

+        mAppRODataDir = app_read_only_data_dir;

+        mSkinBaseDir = add(mAppRODataDir, "skins");

+    }

+    mCAFile = add(mAppRODataDir, "ca-bundle.crt");

+}

+

+std::string LLDir_Mac::getCurPath()

+{

+    return boost::filesystem::path( boost::filesystem::current_path() ).string();

+}

+

+

+

+bool LLDir_Mac::fileExists(const std::string &filename) const

+{

+    return boost::filesystem::exists(filename);

+}

+

+

+/*virtual*/ std::string LLDir_Mac::getLLPluginLauncher()

+{

+    return gDirUtilp->getAppRODataDir() + gDirUtilp->getDirDelimiter() +

+        "SLPlugin.app/Contents/MacOS/SLPlugin";

+}

+

+/*virtual*/ std::string LLDir_Mac::getLLPluginFilename(std::string base_name)

+{

+    return gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter() +

+        base_name + ".dylib";

+}

+

+

+#endif // LL_DARWIN