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

diff --git a/indra/newview/lltransientfloatermgr.h b/indra/newview/lltransientfloatermgr.h
index fda96cfd64..9c9d6bdf3f 100644
--- a/indra/newview/lltransientfloatermgr.h
+++ b/indra/newview/lltransientfloatermgr.h
@@ -1,89 +1,89 @@
-/** 
- * @file lltransientfloatermgr.h
- * @brief LLFocusMgr base class
- *
- * $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_LLTRANSIENTFLOATERMGR_H
-#define LL_LLTRANSIENTFLOATERMGR_H
-
-#include "llui.h"
-#include "llsingleton.h"
-#include "llfloater.h"
-
-class LLTransientFloater;
-
-/**
- * Provides functionality to hide transient floaters.
- */
-class LLTransientFloaterMgr: public LLSingleton<LLTransientFloaterMgr>
-{
-	LLSINGLETON(LLTransientFloaterMgr);
-
-public:
-	enum ETransientGroup
-	{
-		GLOBAL, DOCKED, IM
-	};
-
-	void registerTransientFloater(LLTransientFloater* floater);
-	void unregisterTransientFloater(LLTransientFloater* floater);
-	void addControlView(ETransientGroup group, LLView* view);
-	void removeControlView(ETransientGroup group, LLView* view);
-	void addControlView(LLView* view);
-	void removeControlView(LLView* view);
-
-private:
-	typedef std::set<LLHandle<LLView> > controls_set_t;
-	typedef std::map<ETransientGroup, controls_set_t > group_controls_t;
-
-	void hideTransientFloaters(S32 x, S32 y);
-	void leftMouseClickCallback(S32 x, S32 y, MASK mask);
-	bool isControlClicked(ETransientGroup group, controls_set_t& set, S32 x, S32 y);
-
-	std::set<LLTransientFloater*> mTransSet;
-
-	group_controls_t mGroupControls;
-};
-
-/**
- * An abstract class declares transient floater interfaces.
- */
-class LLTransientFloater
-{
-protected:
-	/**
-	 * Class initialization method.
-	 * Should be called from descendant constructor.
-	 */
-	void init(LLFloater* thiz);
-public:
-	virtual LLTransientFloaterMgr::ETransientGroup getGroup() = 0;
-	bool isTransientDocked() { return mFloater->isDocked(); };
-	void setTransientVisible(bool visible) {mFloater->setVisible(visible); }
-
-private:
-	LLFloater* mFloater;
-};
-
-#endif  // LL_LLTRANSIENTFLOATERMGR_H
+/**

+ * @file lltransientfloatermgr.h

+ * @brief LLFocusMgr base class

+ *

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

+#define LL_LLTRANSIENTFLOATERMGR_H

+

+#include "llui.h"

+#include "llsingleton.h"

+#include "llfloater.h"

+

+class LLTransientFloater;

+

+/**

+ * Provides functionality to hide transient floaters.

+ */

+class LLTransientFloaterMgr: public LLSingleton<LLTransientFloaterMgr>

+{

+    LLSINGLETON(LLTransientFloaterMgr);

+

+public:

+    enum ETransientGroup

+    {

+        GLOBAL, DOCKED, IM

+    };

+

+    void registerTransientFloater(LLTransientFloater* floater);

+    void unregisterTransientFloater(LLTransientFloater* floater);

+    void addControlView(ETransientGroup group, LLView* view);

+    void removeControlView(ETransientGroup group, LLView* view);

+    void addControlView(LLView* view);

+    void removeControlView(LLView* view);

+

+private:

+    typedef std::set<LLHandle<LLView> > controls_set_t;

+    typedef std::map<ETransientGroup, controls_set_t > group_controls_t;

+

+    void hideTransientFloaters(S32 x, S32 y);

+    void leftMouseClickCallback(S32 x, S32 y, MASK mask);

+    bool isControlClicked(ETransientGroup group, controls_set_t& set, S32 x, S32 y);

+

+    std::set<LLTransientFloater*> mTransSet;

+

+    group_controls_t mGroupControls;

+};

+

+/**

+ * An abstract class declares transient floater interfaces.

+ */

+class LLTransientFloater

+{

+protected:

+    /**

+     * Class initialization method.

+     * Should be called from descendant constructor.

+     */

+    void init(LLFloater* thiz);

+public:

+    virtual LLTransientFloaterMgr::ETransientGroup getGroup() = 0;

+    bool isTransientDocked() { return mFloater->isDocked(); };

+    void setTransientVisible(bool visible) {mFloater->setVisible(visible); }

+

+private:

+    LLFloater* mFloater;

+};

+

+#endif  // LL_LLTRANSIENTFLOATERMGR_H