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

diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp
index 7f5458103e..3ef5242de0 100644
--- a/indra/newview/lldebugview.cpp
+++ b/indra/newview/lldebugview.cpp
@@ -1,134 +1,134 @@
-/** 
- * @file lldebugview.cpp
- * @brief A view containing UI elements only visible in build mode.
- *
- * $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 "lldebugview.h"
-
-// library includes
-#include "llfasttimerview.h"
-#include "llconsole.h"
-#include "lltextureview.h"
-#include "llresmgr.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llappviewer.h"
-#include "llsceneview.h"
-#include "llviewertexture.h"
-#include "llfloaterreg.h"
-#include "llscenemonitor.h"
-//
-// Globals
-//
-
-LLDebugView* gDebugView = NULL;
-
-//
-// Methods
-//
-static LLDefaultChildRegistry::Register<LLDebugView> r("debug_view");
-
-LLDebugView::LLDebugView(const LLDebugView::Params& p)
-:	LLView(p),
-	mFastTimerView(NULL),
-	mDebugConsolep(NULL),
-	mFloaterSnapRegion(NULL)
-{}
-
-LLDebugView::~LLDebugView()
-{
-	// These have already been deleted.  Fix the globals appropriately.
-	gDebugView = NULL;
-	gTextureView = NULL;
-	gSceneView = NULL;
-	gSceneMonitorView = NULL;
-}
-
-void LLDebugView::init()
-{
-	LLRect r;
-	LLRect rect = getLocalRect();
-
-	// Rectangle to draw debug data in (full height, 3/4 width)
-	r.set(10, rect.getHeight() - 100, ((rect.getWidth()*3)/4), 100);
-	LLConsole::Params cp;
-	cp.name("debug console");
-	cp.max_lines(20);
-	cp.rect(r);
-	cp.font(LLFontGL::getFontMonospace());
-	cp.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_LEFT);
-	cp.visible(false);
-	mDebugConsolep = LLUICtrlFactory::create<LLConsole>(cp);
-	addChild(mDebugConsolep);
-
-	r.set(150 - 25, rect.getHeight() - 50, rect.getWidth()/2 - 25, rect.getHeight() - 450);
-
-	r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), 
-  									 (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));
-	
-	mFastTimerView = dynamic_cast<LLFastTimerView*>(LLFloaterReg::getInstance("block_timers"));
-
-	gSceneView = new LLSceneView(r);
-	gSceneView->setFollowsTop();
-	gSceneView->setFollowsLeft();
-	gSceneView->setVisible(false);
-	addChild(gSceneView);
-	gSceneView->setRect(rect);
-	
-	gSceneMonitorView = new LLSceneMonitorView(r);
-	gSceneMonitorView->setFollowsTop();
-	gSceneMonitorView->setFollowsLeft();
-	gSceneMonitorView->setVisible(false);
-	addChild(gSceneMonitorView);
-	gSceneMonitorView->setRect(rect);
-	
-	r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f), 
-									 (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));
-
-	r.set(150, rect.getHeight() - 50, 820, 100);
-	LLTextureView::Params tvp;
-	tvp.name("gTextureView");
-	tvp.rect(r);
-	tvp.follows.flags(FOLLOWS_TOP|FOLLOWS_LEFT);
-	tvp.visible(false);
-	gTextureView = LLUICtrlFactory::create<LLTextureView>(tvp);
-	addChild(gTextureView);
-	//gTextureView->reshape(r.getWidth(), r.getHeight(), true);
-}
-
-void LLDebugView::draw()
-{
-	if (mFloaterSnapRegion == NULL)
-	{
-		mFloaterSnapRegion = getRootView()->getChildView("floater_snap_region");
-	}
-
-	LLRect debug_rect;
-	mFloaterSnapRegion->localRectToOtherView(mFloaterSnapRegion->getLocalRect(), &debug_rect, getParent());
-
-	setShape(debug_rect);
-	LLView::draw();
-}
+/**

+ * @file lldebugview.cpp

+ * @brief A view containing UI elements only visible in build mode.

+ *

+ * $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 "lldebugview.h"

+

+// library includes

+#include "llfasttimerview.h"

+#include "llconsole.h"

+#include "lltextureview.h"

+#include "llresmgr.h"

+#include "llviewercontrol.h"

+#include "llviewerwindow.h"

+#include "llappviewer.h"

+#include "llsceneview.h"

+#include "llviewertexture.h"

+#include "llfloaterreg.h"

+#include "llscenemonitor.h"

+//

+// Globals

+//

+

+LLDebugView* gDebugView = NULL;

+

+//

+// Methods

+//

+static LLDefaultChildRegistry::Register<LLDebugView> r("debug_view");

+

+LLDebugView::LLDebugView(const LLDebugView::Params& p)

+:   LLView(p),

+    mFastTimerView(NULL),

+    mDebugConsolep(NULL),

+    mFloaterSnapRegion(NULL)

+{}

+

+LLDebugView::~LLDebugView()

+{

+    // These have already been deleted.  Fix the globals appropriately.

+    gDebugView = NULL;

+    gTextureView = NULL;

+    gSceneView = NULL;

+    gSceneMonitorView = NULL;

+}

+

+void LLDebugView::init()

+{

+    LLRect r;

+    LLRect rect = getLocalRect();

+

+    // Rectangle to draw debug data in (full height, 3/4 width)

+    r.set(10, rect.getHeight() - 100, ((rect.getWidth()*3)/4), 100);

+    LLConsole::Params cp;

+    cp.name("debug console");

+    cp.max_lines(20);

+    cp.rect(r);

+    cp.font(LLFontGL::getFontMonospace());

+    cp.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_LEFT);

+    cp.visible(false);

+    mDebugConsolep = LLUICtrlFactory::create<LLConsole>(cp);

+    addChild(mDebugConsolep);

+

+    r.set(150 - 25, rect.getHeight() - 50, rect.getWidth()/2 - 25, rect.getHeight() - 450);

+

+    r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),

+                                     (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));

+

+    mFastTimerView = dynamic_cast<LLFastTimerView*>(LLFloaterReg::getInstance("block_timers"));

+

+    gSceneView = new LLSceneView(r);

+    gSceneView->setFollowsTop();

+    gSceneView->setFollowsLeft();

+    gSceneView->setVisible(false);

+    addChild(gSceneView);

+    gSceneView->setRect(rect);

+

+    gSceneMonitorView = new LLSceneMonitorView(r);

+    gSceneMonitorView->setFollowsTop();

+    gSceneMonitorView->setFollowsLeft();

+    gSceneMonitorView->setVisible(false);

+    addChild(gSceneMonitorView);

+    gSceneMonitorView->setRect(rect);

+

+    r.setLeftTopAndSize(25, rect.getHeight() - 50, (S32) (gViewerWindow->getWindowRectScaled().getWidth() * 0.75f),

+                                     (S32) (gViewerWindow->getWindowRectScaled().getHeight() * 0.75f));

+

+    r.set(150, rect.getHeight() - 50, 820, 100);

+    LLTextureView::Params tvp;

+    tvp.name("gTextureView");

+    tvp.rect(r);

+    tvp.follows.flags(FOLLOWS_TOP|FOLLOWS_LEFT);

+    tvp.visible(false);

+    gTextureView = LLUICtrlFactory::create<LLTextureView>(tvp);

+    addChild(gTextureView);

+    //gTextureView->reshape(r.getWidth(), r.getHeight(), true);

+}

+

+void LLDebugView::draw()

+{

+    if (mFloaterSnapRegion == NULL)

+    {

+        mFloaterSnapRegion = getRootView()->getChildView("floater_snap_region");

+    }

+

+    LLRect debug_rect;

+    mFloaterSnapRegion->localRectToOtherView(mFloaterSnapRegion->getLocalRect(), &debug_rect, getParent());

+

+    setShape(debug_rect);

+    LLView::draw();

+}