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

diff --git a/indra/llui/llmenubutton.h b/indra/llui/llmenubutton.h
index 1854f459d5..4b66d236b7 100644
--- a/indra/llui/llmenubutton.h
+++ b/indra/llui/llmenubutton.h
@@ -1,101 +1,101 @@
-/** 
- * @file llbutton.h
- * @brief Header for buttons
- *
- * $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$
- */
-
-#ifndef LL_LLMENUBUTTON_H
-#define LL_LLMENUBUTTON_H
-
-#include "llbutton.h"
-
-class LLToggleableMenu;
-
-class LLMenuButton
-: public LLButton
-{
-	LOG_CLASS(LLMenuButton);
-
-public:
-	typedef enum e_menu_position
-	{
-		MP_TOP_LEFT,
-		MP_TOP_RIGHT,
-		MP_BOTTOM_LEFT,
-		MP_BOTTOM_RIGHT
-	} EMenuPosition;
-
-	struct MenuPositions
-		:	public LLInitParam::TypeValuesHelper<EMenuPosition, MenuPositions>
-	{
-		static void declareValues();
-	};
-
-	struct Params 
-	:	public LLInitParam::Block<Params, LLButton::Params>
-	{
-		// filename for it's toggleable menu
-		Optional<std::string>	menu_filename;
-		Optional<EMenuPosition, MenuPositions>	position;
-	
-		Params();
-	};
-
-
-	
-	boost::signals2::connection setMouseDownCallback( const mouse_signal_t::slot_type& cb );
-
-	/*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask);
-	/*virtual*/ bool handleKeyHere(KEY key, MASK mask );
-
-	void hideMenu();
-
-	LLToggleableMenu* getMenu();
-	void setMenu(const std::string& menu_filename, EMenuPosition position = MP_TOP_LEFT);
-	void setMenu(LLToggleableMenu* menu, EMenuPosition position = MP_TOP_LEFT, bool take_ownership = false);
-
-	void setMenuPosition(EMenuPosition position) { mMenuPosition = position; }
-
-protected:
-	friend class LLUICtrlFactory;
-	LLMenuButton(const Params&);
-	~LLMenuButton();
-
-	void toggleMenu();
-	void updateMenuOrigin();
-
-	void onMenuVisibilityChange(const LLSD& param);
-
-private:
-	void cleanup();
-
-	LLHandle<LLView>		mMenuHandle;
-	bool					mIsMenuShown;
-	EMenuPosition			mMenuPosition;
-	S32						mX;
-	S32						mY;
-	bool					mOwnMenu; // true if we manage the menu lifetime
-};
-
-
-#endif  // LL_LLMENUBUTTON_H
+/**

+ * @file llbutton.h

+ * @brief Header for buttons

+ *

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

+ */

+

+#ifndef LL_LLMENUBUTTON_H

+#define LL_LLMENUBUTTON_H

+

+#include "llbutton.h"

+

+class LLToggleableMenu;

+

+class LLMenuButton

+: public LLButton

+{

+    LOG_CLASS(LLMenuButton);

+

+public:

+    typedef enum e_menu_position

+    {

+        MP_TOP_LEFT,

+        MP_TOP_RIGHT,

+        MP_BOTTOM_LEFT,

+        MP_BOTTOM_RIGHT

+    } EMenuPosition;

+

+    struct MenuPositions

+        :   public LLInitParam::TypeValuesHelper<EMenuPosition, MenuPositions>

+    {

+        static void declareValues();

+    };

+

+    struct Params

+    :   public LLInitParam::Block<Params, LLButton::Params>

+    {

+        // filename for it's toggleable menu

+        Optional<std::string>   menu_filename;

+        Optional<EMenuPosition, MenuPositions>  position;

+

+        Params();

+    };

+

+

+

+    boost::signals2::connection setMouseDownCallback( const mouse_signal_t::slot_type& cb );

+

+    /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask);

+    /*virtual*/ bool handleKeyHere(KEY key, MASK mask );

+

+    void hideMenu();

+

+    LLToggleableMenu* getMenu();

+    void setMenu(const std::string& menu_filename, EMenuPosition position = MP_TOP_LEFT);

+    void setMenu(LLToggleableMenu* menu, EMenuPosition position = MP_TOP_LEFT, bool take_ownership = false);

+

+    void setMenuPosition(EMenuPosition position) { mMenuPosition = position; }

+

+protected:

+    friend class LLUICtrlFactory;

+    LLMenuButton(const Params&);

+    ~LLMenuButton();

+

+    void toggleMenu();

+    void updateMenuOrigin();

+

+    void onMenuVisibilityChange(const LLSD& param);

+

+private:

+    void cleanup();

+

+    LLHandle<LLView>        mMenuHandle;

+    bool                    mIsMenuShown;

+    EMenuPosition           mMenuPosition;

+    S32                     mX;

+    S32                     mY;

+    bool                    mOwnMenu; // true if we manage the menu lifetime

+};

+

+

+#endif  // LL_LLMENUBUTTON_H