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, 106 insertions, 106 deletions

diff --git a/indra/llcommon/llmortician.cpp b/indra/llcommon/llmortician.cpp
index b3e03bde3f..7ba023f052 100644
--- a/indra/llcommon/llmortician.cpp
+++ b/indra/llcommon/llmortician.cpp
@@ -1,106 +1,106 @@
-/** 
- * @file llmortician.cpp
- *
- * $LicenseInfo:firstyear=2005&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$
- */
-
-#include "linden_common.h"
-#include "llmortician.h"
-
-#include <list>
-
-std::list<LLMortician*> LLMortician::sGraveyard;
-
-bool LLMortician::sDestroyImmediate = false;
-
-LLMortician::~LLMortician() 
-{
-	sGraveyard.remove(this);
-}
-
-size_t LLMortician::logClass(std::stringstream &str)
-{
-    auto size = sGraveyard.size();
-    str << "Mortician graveyard count: " << size;
-    str << " Zealous: " << (sDestroyImmediate ? "True" : "False");
-    if (size == 0)
-    {
-        return size;
-    }
-    str << " Output:\n";
-    std::list<LLMortician*>::iterator iter = sGraveyard.begin();
-    std::list<LLMortician*>::iterator end = sGraveyard.end();
-    while (iter!=end)
-    {
-        LLMortician* dead = *iter;
-        iter++;
-        // Be as detailed and safe as possible to figure out issues
-        str << "Pointer: " << dead;
-        if (dead)
-        {
-            try
-            {
-                str << " Is dead: " << (dead->isDead() ? "True" : "False");
-                str << " Name: " << typeid(*dead).name();
-            }
-            catch (...)
-            {
-
-            }
-        }
-        str << "\n";
-    }
-    str << "--------------------------------------------";
-    return size;
-}
-
-void LLMortician::updateClass() 
-{
-	while (!sGraveyard.empty()) 
-	{
-		LLMortician* dead = sGraveyard.front();
-		delete dead;
-	}
-}
-
-void LLMortician::die() 
-{
-	// It is valid to call die() more than once on something that hasn't died yet
-	if (sDestroyImmediate)
-	{
-		// *NOTE: This is a hack to ensure destruction order on shutdown (relative to non-mortician controlled classes).
-		mIsDead = true;
-		delete this;
-		return;
-	}
-	else if (!mIsDead)
-	{
-		mIsDead = true;
-		sGraveyard.push_back(this);
-	}
-}
-
-// static
-void LLMortician::setZealous(bool b)
-{
-	sDestroyImmediate = b;
-}
+/**

+ * @file llmortician.cpp

+ *

+ * $LicenseInfo:firstyear=2005&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$

+ */

+

+#include "linden_common.h"

+#include "llmortician.h"

+

+#include <list>

+

+std::list<LLMortician*> LLMortician::sGraveyard;

+

+bool LLMortician::sDestroyImmediate = false;

+

+LLMortician::~LLMortician()

+{

+    sGraveyard.remove(this);

+}

+

+size_t LLMortician::logClass(std::stringstream &str)

+{

+    auto size = sGraveyard.size();

+    str << "Mortician graveyard count: " << size;

+    str << " Zealous: " << (sDestroyImmediate ? "True" : "False");

+    if (size == 0)

+    {

+        return size;

+    }

+    str << " Output:\n";

+    std::list<LLMortician*>::iterator iter = sGraveyard.begin();

+    std::list<LLMortician*>::iterator end = sGraveyard.end();

+    while (iter!=end)

+    {

+        LLMortician* dead = *iter;

+        iter++;

+        // Be as detailed and safe as possible to figure out issues

+        str << "Pointer: " << dead;

+        if (dead)

+        {

+            try

+            {

+                str << " Is dead: " << (dead->isDead() ? "True" : "False");

+                str << " Name: " << typeid(*dead).name();

+            }

+            catch (...)

+            {

+

+            }

+        }

+        str << "\n";

+    }

+    str << "--------------------------------------------";

+    return size;

+}

+

+void LLMortician::updateClass()

+{

+    while (!sGraveyard.empty())

+    {

+        LLMortician* dead = sGraveyard.front();

+        delete dead;

+    }

+}

+

+void LLMortician::die()

+{

+    // It is valid to call die() more than once on something that hasn't died yet

+    if (sDestroyImmediate)

+    {

+        // *NOTE: This is a hack to ensure destruction order on shutdown (relative to non-mortician controlled classes).

+        mIsDead = true;

+        delete this;

+        return;

+    }

+    else if (!mIsDead)

+    {

+        mIsDead = true;

+        sGraveyard.push_back(this);

+    }

+}

+

+// static

+void LLMortician::setZealous(bool b)

+{

+    sDestroyImmediate = b;

+}