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, 108 insertions, 106 deletions

diff --git a/indra/newview/llsplitbutton.h b/indra/newview/llsplitbutton.h
index a4a6a179c1..0a5a8abdf6 100644
--- a/indra/newview/llsplitbutton.h
+++ b/indra/newview/llsplitbutton.h
@@ -1,106 +1,108 @@
-/** 
- * @file llsplitbutton.h
- * @brief LLSplitButton base class
- *
- * $LicenseInfo:firstyear=2009&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$
- */
-
-// A control that displays the name of the chosen item, which when clicked
-// shows a scrolling box of choices.
-
-
-#include "llbutton.h"
-#include "llpanel.h"
-#include "lluictrl.h"
-
-
-#ifndef LL_LLSPLITBUTTON_H
-#define LL_LLSPLITBUTTON_H
-
-class LLSplitButton
-	:	public LLUICtrl
-{
-public:
-	typedef enum e_arrow_position
-	{
-		LEFT,
-		RIGHT
-	} EArrowPosition;
-
-	struct ArrowPositionValues : public LLInitParam::TypeValuesHelper<EArrowPosition, ArrowPositionValues>
-	{
-		static void declareValues();
-	};
-
-	struct ItemParams : public LLInitParam::Block<ItemParams, LLButton::Params>
-	{
-		ItemParams();
-	};
-
-	struct Params :	public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<EArrowPosition, ArrowPositionValues> arrow_position;
-		Optional<LLButton::Params> arrow_button;
-		Optional<LLPanel::Params> items_panel;
-		Multiple<ItemParams> items;
-
-		Params();
-	};
-
-
-	virtual ~LLSplitButton() {};
-
-	//Overridden
-	virtual void	onFocusLost();
-	virtual void	setFocus(bool b);
-	virtual void	setEnabled(bool enabled);
-
-	//Callbacks
-	void	onArrowBtnDown();
-	void	onHeldDownShownButton();
-	void	onItemSelected(LLUICtrl* ctrl);
-	void	setSelectionCallback(commit_callback_t cb) { mSelectionCallback = cb; }
-
-	virtual bool handleMouseUp(S32 x, S32 y, MASK mask);
-
-	virtual void	showButtons();
-	virtual void	hideButtons();
-
-
-protected:
-	friend class LLUICtrlFactory;
-	LLSplitButton(const LLSplitButton::Params& p);
-
-	LLButton* prepareItemButton(LLButton::Params params);
-	LLPanel* prepareItemsPanel(LLPanel::Params params, S32 items_count);
-
-	LLPanel* mItemsPanel;
-	std::list<LLButton*> mHidenItems;
-	LLButton* mArrowBtn;
-	LLButton* mShownItem;
-	EArrowPosition mArrowPosition;
-
-	commit_callback_t mSelectionCallback;
-};
-
-
-#endif
+/**

+ * @file llsplitbutton.h

+ * @brief LLSplitButton base class

+ *

+ * $LicenseInfo:firstyear=2009&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$

+ */

+

+// A control that displays the name of the chosen item, which when clicked

+// shows a scrolling box of choices.

+

+

+#include "llbutton.h"

+#include "llpanel.h"

+#include "lluictrl.h"

+

+

+#ifndef LL_LLSPLITBUTTON_H

+#define LL_LLSPLITBUTTON_H

+

+class LLSplitButton

+    :   public LLUICtrl

+{

+public:

+    typedef enum e_arrow_position

+    {

+        LEFT,

+        RIGHT

+    } EArrowPosition;

+

+    struct ArrowPositionValues : public LLInitParam::TypeValuesHelper<EArrowPosition, ArrowPositionValues>

+    {

+        static void declareValues();

+    };

+

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

+    {

+        ItemParams();

+    };

+

+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>

+    {

+        Optional<EArrowPosition, ArrowPositionValues> arrow_position;

+        Optional<LLButton::Params> arrow_button;

+        Optional<LLPanel::Params> items_panel;

+        Multiple<ItemParams> items;

+

+        Params();

+    };

+

+

+    virtual ~LLSplitButton();

+

+    //Overridden

+    virtual void    onFocusLost();

+    virtual void    setFocus(bool b);

+    virtual void    setEnabled(bool enabled);

+

+    //Callbacks

+    void    onArrowBtnDown();

+    void    onHeldDownShownButton();

+    void    onItemSelected(LLUICtrl* ctrl);

+    void    setSelectionCallback(commit_callback_t cb) { mSelectionCallback = cb; }

+

+    virtual bool handleMouseUp(S32 x, S32 y, MASK mask);

+

+    virtual void    showButtons();

+    virtual void    hideButtons();

+

+

+protected:

+    friend class LLUICtrlFactory;

+    LLSplitButton(const LLSplitButton::Params& p);

+

+    LLButton* prepareItemButton(LLButton::Params params);

+    LLPanel* prepareItemsPanel(LLPanel::Params params, S32 items_count);

+

+    LLPanel* mItemsPanel;

+    std::list<LLButton*> mHidenItems;

+    LLButton* mArrowBtn;

+    LLButton* mShownItem;

+    EArrowPosition mArrowPosition;

+

+    boost::signals2::connection mTopLostSignalConnection;

+

+    commit_callback_t mSelectionCallback;

+};

+

+

+#endif