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

diff --git a/indra/newview/lldebugmessagebox.h b/indra/newview/lldebugmessagebox.h
index 0cd01f1e84..53afae40fe 100644
--- a/indra/newview/lldebugmessagebox.h
+++ b/indra/newview/lldebugmessagebox.h
@@ -1,88 +1,88 @@
-/** 
- * @file lldebugmessagebox.h
- * @brief Debug message box.
- *
- * $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$
- */
-
-
-#ifndef LL_LLDEBUGMESSAGEBOX_H
-#define LL_LLDEBUGMESSAGEBOX_H
-
-#include "llfloater.h"
-#include "v3math.h"
-#include "lltextbox.h"
-#include "llstring.h"
-#include "llframetimer.h"
-#include <vector>
-#include <map>
-
-class LLSliderCtrl;
-
-//----------------------------------------------------------------------------
-// LLDebugVarMessageBox
-//----------------------------------------------------------------------------
-
-typedef enum e_debug_var_type
-{
-	VAR_TYPE_F32,
-	VAR_TYPE_S32,
-	VAR_TYPE_VEC2,
-	VAR_TYPE_VEC3,
-	VAR_TYPE_VEC4,
-	VAR_TYPE_COUNT
-} EDebugVarType;
-
-class LLDebugVarMessageBox : public LLFloater
-{
-protected:
-	LLDebugVarMessageBox(const std::string& title, EDebugVarType var_type, void *var);
-	~LLDebugVarMessageBox();
-
-	static LLDebugVarMessageBox* show(const std::string& title, EDebugVarType var_type, void *var);
-	void sliderChanged(const LLSD& data);
-	void onAnimateClicked(const LLSD& data);
-
-public:
-	static void show(const std::string& title, F32 *var, F32 max_value = 100.f, F32 increment = 0.1f);
-	static void show(const std::string& title, S32 *var, S32 max_value = 255, S32 increment = 1);
-	static void show(const std::string& title, LLVector2 *var, LLVector2 max_value = LLVector2(100.f, 100.f), LLVector2 increment = LLVector2(0.1f, 0.1f));
-	static void show(const std::string& title, LLVector3 *var, LLVector3 max_value = LLVector3(100.f, 100.f, 100.f), LLVector3 increment = LLVector3(0.1f, 0.1f, 0.1f));
-	//static void show(const std::string& title, LLVector4 *var, LLVector4 max_value = LLVector4(100.f, 100.f, 100.f, 100.f), LLVector4 increment = LLVector4(0.1f, 0.1f, 0.1f, 0.1f));	
-		
-	virtual void	draw();
-
-protected:
-	EDebugVarType	mVarType;
-	void*			mVarData;
-	LLSliderCtrl*	mSlider1;
-	LLSliderCtrl*	mSlider2;
-	LLSliderCtrl*	mSlider3;
-	LLButton*		mAnimateButton;
-	LLTextBox*		mText;
-	std::string		mTitle;
-	bool			mAnimate;
-
-	static std::map<std::string, LLDebugVarMessageBox*> sInstances;
-};
-
-#endif // LL_LLMESSAGEBOX_H
+/**

+ * @file lldebugmessagebox.h

+ * @brief Debug message box.

+ *

+ * $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$

+ */

+

+

+#ifndef LL_LLDEBUGMESSAGEBOX_H

+#define LL_LLDEBUGMESSAGEBOX_H

+

+#include "llfloater.h"

+#include "v3math.h"

+#include "lltextbox.h"

+#include "llstring.h"

+#include "llframetimer.h"

+#include <vector>

+#include <map>

+

+class LLSliderCtrl;

+

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

+// LLDebugVarMessageBox

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

+

+typedef enum e_debug_var_type

+{

+    VAR_TYPE_F32,

+    VAR_TYPE_S32,

+    VAR_TYPE_VEC2,

+    VAR_TYPE_VEC3,

+    VAR_TYPE_VEC4,

+    VAR_TYPE_COUNT

+} EDebugVarType;

+

+class LLDebugVarMessageBox : public LLFloater

+{

+protected:

+    LLDebugVarMessageBox(const std::string& title, EDebugVarType var_type, void *var);

+    ~LLDebugVarMessageBox();

+

+    static LLDebugVarMessageBox* show(const std::string& title, EDebugVarType var_type, void *var);

+    void sliderChanged(const LLSD& data);

+    void onAnimateClicked(const LLSD& data);

+

+public:

+    static void show(const std::string& title, F32 *var, F32 max_value = 100.f, F32 increment = 0.1f);

+    static void show(const std::string& title, S32 *var, S32 max_value = 255, S32 increment = 1);

+    static void show(const std::string& title, LLVector2 *var, LLVector2 max_value = LLVector2(100.f, 100.f), LLVector2 increment = LLVector2(0.1f, 0.1f));

+    static void show(const std::string& title, LLVector3 *var, LLVector3 max_value = LLVector3(100.f, 100.f, 100.f), LLVector3 increment = LLVector3(0.1f, 0.1f, 0.1f));

+    //static void show(const std::string& title, LLVector4 *var, LLVector4 max_value = LLVector4(100.f, 100.f, 100.f, 100.f), LLVector4 increment = LLVector4(0.1f, 0.1f, 0.1f, 0.1f));

+

+    virtual void    draw();

+

+protected:

+    EDebugVarType   mVarType;

+    void*           mVarData;

+    LLSliderCtrl*   mSlider1;

+    LLSliderCtrl*   mSlider2;

+    LLSliderCtrl*   mSlider3;

+    LLButton*       mAnimateButton;

+    LLTextBox*      mText;

+    std::string     mTitle;

+    bool            mAnimate;

+

+    static std::map<std::string, LLDebugVarMessageBox*> sInstances;

+};

+

+#endif // LL_LLMESSAGEBOX_H