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

diff --git a/indra/newview/llfloatermemleak.cpp b/indra/newview/llfloatermemleak.cpp
index 327de5e2c3..68425116c6 100644
--- a/indra/newview/llfloatermemleak.cpp
+++ b/indra/newview/llfloatermemleak.cpp
@@ -1,230 +1,230 @@
-/** 
- * @file llfloatermemleak.cpp
- * @brief LLFloatermemleak class definition
- *
- * $LicenseInfo:firstyear=2007&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 "llviewerprecompiledheaders.h"
-
-#include "llfloatermemleak.h"
-
-#include "lluictrlfactory.h"
-#include "llbutton.h"
-#include "llspinctrl.h"
-#include "llresmgr.h"
-
-#include "llmath.h"
-#include "llviewerwindow.h"
-
-U32 LLFloaterMemLeak::sMemLeakingSpeed = 0 ; //bytes leaked per frame
-U32 LLFloaterMemLeak::sMaxLeakedMem = 0 ; //maximum allowed leaked memory
-U32 LLFloaterMemLeak::sTotalLeaked = 0 ;
-S32 LLFloaterMemLeak::sStatus = LLFloaterMemLeak::STOP ;
-bool LLFloaterMemLeak::sbAllocationFailed = false ;
-
-extern bool gSimulateMemLeak;
-
-LLFloaterMemLeak::LLFloaterMemLeak(const LLSD& key)
-	: LLFloater(key)
-{
-	setTitle("Memory Leaking Simulation Floater");
-	mCommitCallbackRegistrar.add("MemLeak.ChangeLeakingSpeed",	boost::bind(&LLFloaterMemLeak::onChangeLeakingSpeed, this));
-	mCommitCallbackRegistrar.add("MemLeak.ChangeMaxMemLeaking",	boost::bind(&LLFloaterMemLeak::onChangeMaxMemLeaking, this));
-	mCommitCallbackRegistrar.add("MemLeak.Start",	boost::bind(&LLFloaterMemLeak::onClickStart, this));
-	mCommitCallbackRegistrar.add("MemLeak.Stop",	boost::bind(&LLFloaterMemLeak::onClickStop, this));
-	mCommitCallbackRegistrar.add("MemLeak.Release",	boost::bind(&LLFloaterMemLeak::onClickRelease, this));
-	mCommitCallbackRegistrar.add("MemLeak.Close",	boost::bind(&LLFloaterMemLeak::onClickClose, this));
-}
-//----------------------------------------------
-
-bool LLFloaterMemLeak::postBuild(void)
-{	
-	F32 a, b ;
-	a = getChild<LLUICtrl>("leak_speed")->getValue().asReal();
-	if(a > (F32)(0xFFFFFFFF))
-	{
-		sMemLeakingSpeed = 0xFFFFFFFF ;
-	}
-	else
-	{
-		sMemLeakingSpeed = (U32)a ;
-	}
-	b = getChild<LLUICtrl>("max_leak")->getValue().asReal();
-	if(b > (F32)0xFFF)
-	{
-		sMaxLeakedMem = 0xFFFFFFFF ;
-	}
-	else
-	{
-		sMaxLeakedMem = ((U32)b) << 20 ;
-	}
-	
-	sbAllocationFailed = false ;
-	return true ;
-}
-LLFloaterMemLeak::~LLFloaterMemLeak()
-{
-	release() ;
-		
-	sMemLeakingSpeed = 0 ; //bytes leaked per frame
-	sMaxLeakedMem = 0 ; //maximum allowed leaked memory	
-}
-
-void LLFloaterMemLeak::release()
-{
-	if(mLeakedMem.empty())
-	{
-		return ;
-	}
-
-	for(S32 i = 0 ; i < (S32)mLeakedMem.size() ; i++)
-	{
-		delete[] mLeakedMem[i] ;
-	}
-	mLeakedMem.clear() ;
-
-	sStatus = STOP ;
-	sTotalLeaked = 0 ;
-	sbAllocationFailed = false ;
-	gSimulateMemLeak = false;
-}
-
-void LLFloaterMemLeak::stop()
-{
-	sStatus = STOP ;
-	sbAllocationFailed = true ;
-}
-
-void LLFloaterMemLeak::idle()
-{
-	if(STOP == sStatus)
-	{
-		return ;
-	}
-
-	sbAllocationFailed = false ;
-	
-	if(RELEASE == sStatus)
-	{
-		release() ;
-		return ;
-	}
-
-	char* p = NULL ;
-	if(sMemLeakingSpeed > 0 && sTotalLeaked < sMaxLeakedMem)
-	{
-		p = new char[sMemLeakingSpeed] ;
-
-		if(p)
-		{
-			mLeakedMem.push_back(p) ;
-			sTotalLeaked += sMemLeakingSpeed ;
-		}
-	}
-	if(!p)
-	{
-		stop();
-	}
-}
-
-//----------------------
-void LLFloaterMemLeak::onChangeLeakingSpeed()
-{
-	F32 tmp ;
-	tmp =getChild<LLUICtrl>("leak_speed")->getValue().asReal();
-
-	if(tmp > (F32)0xFFFFFFFF)
-	{
-		sMemLeakingSpeed = 0xFFFFFFFF ;
-	}
-	else
-	{
-		sMemLeakingSpeed = (U32)tmp ;
-	}
-
-}
-
-void LLFloaterMemLeak::onChangeMaxMemLeaking()
-{
-
-	F32 tmp ;
-	tmp =getChild<LLUICtrl>("max_leak")->getValue().asReal();
-	if(tmp > (F32)0xFFF)
-	{
-		sMaxLeakedMem = 0xFFFFFFFF ;
-	}
-	else
-	{
-		sMaxLeakedMem = ((U32)tmp) << 20 ;
-	}
-	
-}
-
-void LLFloaterMemLeak::onClickStart()
-{
-	sStatus = START ;
-	gSimulateMemLeak = true;
-}
-
-void LLFloaterMemLeak::onClickStop()
-{
-	sStatus = STOP ;
-}
-
-void LLFloaterMemLeak::onClickRelease()
-{
-	sStatus = RELEASE ;
-}
-
-void LLFloaterMemLeak::onClickClose()
-{
-	setVisible(false);
-}
-
-void LLFloaterMemLeak::draw()
-{
-	//show total memory leaked
-	if(sTotalLeaked > 0)
-	{
-		std::string bytes_string;
-		LLResMgr::getInstance()->getIntegerString(bytes_string, sTotalLeaked >> 10 );
-		getChild<LLUICtrl>("total_leaked_label")->setTextArg("[SIZE]", bytes_string);
-	}
-	else
-	{
-		getChild<LLUICtrl>("total_leaked_label")->setTextArg("[SIZE]", LLStringExplicit("0"));
-	}
-
-	if(sbAllocationFailed)
-	{
-		getChild<LLUICtrl>("note_label_1")->setTextArg("[NOTE1]", LLStringExplicit("Memory leaking simulation stops. Reduce leaking speed or"));
-		getChild<LLUICtrl>("note_label_2")->setTextArg("[NOTE2]", LLStringExplicit("increase max leaked memory, then press Start to continue."));
-	}
-	else
-	{
-		getChild<LLUICtrl>("note_label_1")->setTextArg("[NOTE1]", LLStringExplicit(""));
-		getChild<LLUICtrl>("note_label_2")->setTextArg("[NOTE2]", LLStringExplicit(""));
-	}
-
-	LLFloater::draw();
-}
+/**

+ * @file llfloatermemleak.cpp

+ * @brief LLFloatermemleak class definition

+ *

+ * $LicenseInfo:firstyear=2007&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 "llviewerprecompiledheaders.h"

+

+#include "llfloatermemleak.h"

+

+#include "lluictrlfactory.h"

+#include "llbutton.h"

+#include "llspinctrl.h"

+#include "llresmgr.h"

+

+#include "llmath.h"

+#include "llviewerwindow.h"

+

+U32 LLFloaterMemLeak::sMemLeakingSpeed = 0 ; //bytes leaked per frame

+U32 LLFloaterMemLeak::sMaxLeakedMem = 0 ; //maximum allowed leaked memory

+U32 LLFloaterMemLeak::sTotalLeaked = 0 ;

+S32 LLFloaterMemLeak::sStatus = LLFloaterMemLeak::STOP ;

+bool LLFloaterMemLeak::sbAllocationFailed = false ;

+

+extern bool gSimulateMemLeak;

+

+LLFloaterMemLeak::LLFloaterMemLeak(const LLSD& key)

+    : LLFloater(key)

+{

+    setTitle("Memory Leaking Simulation Floater");

+    mCommitCallbackRegistrar.add("MemLeak.ChangeLeakingSpeed",  boost::bind(&LLFloaterMemLeak::onChangeLeakingSpeed, this));

+    mCommitCallbackRegistrar.add("MemLeak.ChangeMaxMemLeaking", boost::bind(&LLFloaterMemLeak::onChangeMaxMemLeaking, this));

+    mCommitCallbackRegistrar.add("MemLeak.Start",   boost::bind(&LLFloaterMemLeak::onClickStart, this));

+    mCommitCallbackRegistrar.add("MemLeak.Stop",    boost::bind(&LLFloaterMemLeak::onClickStop, this));

+    mCommitCallbackRegistrar.add("MemLeak.Release", boost::bind(&LLFloaterMemLeak::onClickRelease, this));

+    mCommitCallbackRegistrar.add("MemLeak.Close",   boost::bind(&LLFloaterMemLeak::onClickClose, this));

+}

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

+

+bool LLFloaterMemLeak::postBuild(void)

+{

+    F32 a, b ;

+    a = getChild<LLUICtrl>("leak_speed")->getValue().asReal();

+    if(a > (F32)(0xFFFFFFFF))

+    {

+        sMemLeakingSpeed = 0xFFFFFFFF ;

+    }

+    else

+    {

+        sMemLeakingSpeed = (U32)a ;

+    }

+    b = getChild<LLUICtrl>("max_leak")->getValue().asReal();

+    if(b > (F32)0xFFF)

+    {

+        sMaxLeakedMem = 0xFFFFFFFF ;

+    }

+    else

+    {

+        sMaxLeakedMem = ((U32)b) << 20 ;

+    }

+

+    sbAllocationFailed = false ;

+    return true ;

+}

+LLFloaterMemLeak::~LLFloaterMemLeak()

+{

+    release() ;

+

+    sMemLeakingSpeed = 0 ; //bytes leaked per frame

+    sMaxLeakedMem = 0 ; //maximum allowed leaked memory

+}

+

+void LLFloaterMemLeak::release()

+{

+    if(mLeakedMem.empty())

+    {

+        return ;

+    }

+

+    for(S32 i = 0 ; i < (S32)mLeakedMem.size() ; i++)

+    {

+        delete[] mLeakedMem[i] ;

+    }

+    mLeakedMem.clear() ;

+

+    sStatus = STOP ;

+    sTotalLeaked = 0 ;

+    sbAllocationFailed = false ;

+    gSimulateMemLeak = false;

+}

+

+void LLFloaterMemLeak::stop()

+{

+    sStatus = STOP ;

+    sbAllocationFailed = true ;

+}

+

+void LLFloaterMemLeak::idle()

+{

+    if(STOP == sStatus)

+    {

+        return ;

+    }

+

+    sbAllocationFailed = false ;

+

+    if(RELEASE == sStatus)

+    {

+        release() ;

+        return ;

+    }

+

+    char* p = NULL ;

+    if(sMemLeakingSpeed > 0 && sTotalLeaked < sMaxLeakedMem)

+    {

+        p = new char[sMemLeakingSpeed] ;

+

+        if(p)

+        {

+            mLeakedMem.push_back(p) ;

+            sTotalLeaked += sMemLeakingSpeed ;

+        }

+    }

+    if(!p)

+    {

+        stop();

+    }

+}

+

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

+void LLFloaterMemLeak::onChangeLeakingSpeed()

+{

+    F32 tmp ;

+    tmp =getChild<LLUICtrl>("leak_speed")->getValue().asReal();

+

+    if(tmp > (F32)0xFFFFFFFF)

+    {

+        sMemLeakingSpeed = 0xFFFFFFFF ;

+    }

+    else

+    {

+        sMemLeakingSpeed = (U32)tmp ;

+    }

+

+}

+

+void LLFloaterMemLeak::onChangeMaxMemLeaking()

+{

+

+    F32 tmp ;

+    tmp =getChild<LLUICtrl>("max_leak")->getValue().asReal();

+    if(tmp > (F32)0xFFF)

+    {

+        sMaxLeakedMem = 0xFFFFFFFF ;

+    }

+    else

+    {

+        sMaxLeakedMem = ((U32)tmp) << 20 ;

+    }

+

+}

+

+void LLFloaterMemLeak::onClickStart()

+{

+    sStatus = START ;

+    gSimulateMemLeak = true;

+}

+

+void LLFloaterMemLeak::onClickStop()

+{

+    sStatus = STOP ;

+}

+

+void LLFloaterMemLeak::onClickRelease()

+{

+    sStatus = RELEASE ;

+}

+

+void LLFloaterMemLeak::onClickClose()

+{

+    setVisible(false);

+}

+

+void LLFloaterMemLeak::draw()

+{

+    //show total memory leaked

+    if(sTotalLeaked > 0)

+    {

+        std::string bytes_string;

+        LLResMgr::getInstance()->getIntegerString(bytes_string, sTotalLeaked >> 10 );

+        getChild<LLUICtrl>("total_leaked_label")->setTextArg("[SIZE]", bytes_string);

+    }

+    else

+    {

+        getChild<LLUICtrl>("total_leaked_label")->setTextArg("[SIZE]", LLStringExplicit("0"));

+    }

+

+    if(sbAllocationFailed)

+    {

+        getChild<LLUICtrl>("note_label_1")->setTextArg("[NOTE1]", LLStringExplicit("Memory leaking simulation stops. Reduce leaking speed or"));

+        getChild<LLUICtrl>("note_label_2")->setTextArg("[NOTE2]", LLStringExplicit("increase max leaked memory, then press Start to continue."));

+    }

+    else

+    {

+        getChild<LLUICtrl>("note_label_1")->setTextArg("[NOTE1]", LLStringExplicit(""));

+        getChild<LLUICtrl>("note_label_2")->setTextArg("[NOTE2]", LLStringExplicit(""));

+    }

+

+    LLFloater::draw();

+}