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

diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp
index de3648908f..d597a0cde4 100644
--- a/indra/newview/llfloaterbeacons.cpp
+++ b/indra/newview/llfloaterbeacons.cpp
@@ -1,131 +1,131 @@
-/** 
- * @file llfloaterbeacons.cpp
- * @brief Front-end to LLPipeline controls for highlighting various kinds of objects.
- * @author Coco
- *
- * $LicenseInfo:firstyear=2001&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 "llfloaterbeacons.h"
-#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
-#include "llcheckboxctrl.h"
-#include "pipeline.h"
-
-
-LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
-:	LLFloater(seed)
-{
-	// Initialize pipeline states from saved settings.
-	// OK to do at floater constructor time because beacons do not display unless the floater is open
-	// therefore it is OK to not initialize the pipeline state before needed.
-	// Note also that we should replace those pipeline statics with direct lookup of the saved settings
-	// eliminating the need to keep these states in sync.
-	LLPipeline::setRenderScriptedTouchBeacons(gSavedSettings.getBOOL("scripttouchbeacon"));
-	LLPipeline::setRenderScriptedBeacons(     gSavedSettings.getBOOL("scriptsbeacon"));
-	LLPipeline::setRenderPhysicalBeacons(     gSavedSettings.getBOOL("physicalbeacon"));
-	LLPipeline::setRenderSoundBeacons(        gSavedSettings.getBOOL("soundsbeacon"));
-	LLPipeline::setRenderParticleBeacons(     gSavedSettings.getBOOL("particlesbeacon"));
-	LLPipeline::setRenderHighlights(          gSavedSettings.getBOOL("renderhighlights"));
-	LLPipeline::setRenderBeacons(             gSavedSettings.getBOOL("renderbeacons"));
-	LLPipeline::setRenderMOAPBeacons(		  gSavedSettings.getBOOL("moapbeacon"));
-	mCommitCallbackRegistrar.add("Beacons.UICheck",	boost::bind(&LLFloaterBeacons::onClickUICheck, this,_1));
-}
-
-bool LLFloaterBeacons::postBuild()
-{
-	return true;
-}
-
-// Callback attached to each check box control to both affect their main purpose
-// and to implement the couple screwy interdependency rules that some have.
-
-void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl)
-{
-	LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
-	std::string name = check->getName();
-	if(name == "touch_only")
-	{
-		LLPipeline::toggleRenderScriptedTouchBeacons();
-		// Don't allow both to be ON at the same time. Toggle the other one off if both now on.
-		if (
-			LLPipeline::getRenderScriptedTouchBeacons() &&
-			LLPipeline::getRenderScriptedBeacons() )
-		{
-			LLPipeline::setRenderScriptedBeacons(false);
-			getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(false));
-			getChild<LLCheckBoxCtrl>("scripted")->setValue(false);
-			getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline
-			getChild<LLCheckBoxCtrl>("touch_only")->setValue(true);
-		}
-	}
-	else if(name == "scripted")
-	{
-		LLPipeline::toggleRenderScriptedBeacons();
-		// Don't allow both to be ON at the same time. Toggle the other one off if both now on.
-		if (
-			LLPipeline::getRenderScriptedTouchBeacons() &&
-			LLPipeline::getRenderScriptedBeacons() )
-		{
-			LLPipeline::setRenderScriptedTouchBeacons(false);
-			getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(false));
-			getChild<LLCheckBoxCtrl>("touch_only")->setValue(false);
-			getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline
-			getChild<LLCheckBoxCtrl>("scripted")->setValue(true);
-		}
-	}
-	else if(name == "physical")       LLPipeline::setRenderPhysicalBeacons(check->get());
-	else if(name == "sounds")         LLPipeline::setRenderSoundBeacons(check->get());
-	else if(name == "particles")      LLPipeline::setRenderParticleBeacons(check->get());
-	else if(name == "moapbeacon")     LLPipeline::setRenderMOAPBeacons(check->get());
-	else if(name == "highlights")
-	{
-		LLPipeline::toggleRenderHighlights();
-		// Don't allow both to be OFF at the same time. Toggle the other one on if both now off.
-		if (
-			!LLPipeline::getRenderBeacons() &&
-			!LLPipeline::getRenderHighlights() )
-		{
-			LLPipeline::setRenderBeacons(true);
-			getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(true));
-			getChild<LLCheckBoxCtrl>("beacons")->setValue(true);
-			getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline
-			getChild<LLCheckBoxCtrl>("highlights")->setValue(false); 
-		}
-	}
-	else if(name == "beacons")
-	{
-		LLPipeline::toggleRenderBeacons();
-		// Don't allow both to be OFF at the same time. Toggle the other one on if both now off.
-		if (
-			!LLPipeline::getRenderBeacons() &&
-			!LLPipeline::getRenderHighlights() )
-		{
-			LLPipeline::setRenderHighlights(true);
-			getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(true));
-			getChild<LLCheckBoxCtrl>("highlights")->setValue(true);
-			getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline
-			getChild<LLCheckBoxCtrl>("beacons")->setValue(false); 
-		}
-	}
-}
+/**

+ * @file llfloaterbeacons.cpp

+ * @brief Front-end to LLPipeline controls for highlighting various kinds of objects.

+ * @author Coco

+ *

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

+#include "llviewercontrol.h"

+#include "lluictrlfactory.h"

+#include "llcheckboxctrl.h"

+#include "pipeline.h"

+

+

+LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)

+:   LLFloater(seed)

+{

+    // Initialize pipeline states from saved settings.

+    // OK to do at floater constructor time because beacons do not display unless the floater is open

+    // therefore it is OK to not initialize the pipeline state before needed.

+    // Note also that we should replace those pipeline statics with direct lookup of the saved settings

+    // eliminating the need to keep these states in sync.

+    LLPipeline::setRenderScriptedTouchBeacons(gSavedSettings.getBOOL("scripttouchbeacon"));

+    LLPipeline::setRenderScriptedBeacons(     gSavedSettings.getBOOL("scriptsbeacon"));

+    LLPipeline::setRenderPhysicalBeacons(     gSavedSettings.getBOOL("physicalbeacon"));

+    LLPipeline::setRenderSoundBeacons(        gSavedSettings.getBOOL("soundsbeacon"));

+    LLPipeline::setRenderParticleBeacons(     gSavedSettings.getBOOL("particlesbeacon"));

+    LLPipeline::setRenderHighlights(          gSavedSettings.getBOOL("renderhighlights"));

+    LLPipeline::setRenderBeacons(             gSavedSettings.getBOOL("renderbeacons"));

+    LLPipeline::setRenderMOAPBeacons(         gSavedSettings.getBOOL("moapbeacon"));

+    mCommitCallbackRegistrar.add("Beacons.UICheck", boost::bind(&LLFloaterBeacons::onClickUICheck, this,_1));

+}

+

+bool LLFloaterBeacons::postBuild()

+{

+    return true;

+}

+

+// Callback attached to each check box control to both affect their main purpose

+// and to implement the couple screwy interdependency rules that some have.

+

+void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl)

+{

+    LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;

+    std::string name = check->getName();

+    if(name == "touch_only")

+    {

+        LLPipeline::toggleRenderScriptedTouchBeacons();

+        // Don't allow both to be ON at the same time. Toggle the other one off if both now on.

+        if (

+            LLPipeline::getRenderScriptedTouchBeacons() &&

+            LLPipeline::getRenderScriptedBeacons() )

+        {

+            LLPipeline::setRenderScriptedBeacons(false);

+            getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(false));

+            getChild<LLCheckBoxCtrl>("scripted")->setValue(false);

+            getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline

+            getChild<LLCheckBoxCtrl>("touch_only")->setValue(true);

+        }

+    }

+    else if(name == "scripted")

+    {

+        LLPipeline::toggleRenderScriptedBeacons();

+        // Don't allow both to be ON at the same time. Toggle the other one off if both now on.

+        if (

+            LLPipeline::getRenderScriptedTouchBeacons() &&

+            LLPipeline::getRenderScriptedBeacons() )

+        {

+            LLPipeline::setRenderScriptedTouchBeacons(false);

+            getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(false));

+            getChild<LLCheckBoxCtrl>("touch_only")->setValue(false);

+            getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline

+            getChild<LLCheckBoxCtrl>("scripted")->setValue(true);

+        }

+    }

+    else if(name == "physical")       LLPipeline::setRenderPhysicalBeacons(check->get());

+    else if(name == "sounds")         LLPipeline::setRenderSoundBeacons(check->get());

+    else if(name == "particles")      LLPipeline::setRenderParticleBeacons(check->get());

+    else if(name == "moapbeacon")     LLPipeline::setRenderMOAPBeacons(check->get());

+    else if(name == "highlights")

+    {

+        LLPipeline::toggleRenderHighlights();

+        // Don't allow both to be OFF at the same time. Toggle the other one on if both now off.

+        if (

+            !LLPipeline::getRenderBeacons() &&

+            !LLPipeline::getRenderHighlights() )

+        {

+            LLPipeline::setRenderBeacons(true);

+            getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(true));

+            getChild<LLCheckBoxCtrl>("beacons")->setValue(true);

+            getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline

+            getChild<LLCheckBoxCtrl>("highlights")->setValue(false);

+        }

+    }

+    else if(name == "beacons")

+    {

+        LLPipeline::toggleRenderBeacons();

+        // Don't allow both to be OFF at the same time. Toggle the other one on if both now off.

+        if (

+            !LLPipeline::getRenderBeacons() &&

+            !LLPipeline::getRenderHighlights() )

+        {

+            LLPipeline::setRenderHighlights(true);

+            getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(true));

+            getChild<LLCheckBoxCtrl>("highlights")->setValue(true);

+            getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline

+            getChild<LLCheckBoxCtrl>("beacons")->setValue(false);

+        }

+    }

+}