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

diff --git a/indra/newview/llinventorylistitem.h b/indra/newview/llinventorylistitem.h
index 5dd8496d40..4a8d1124e9 100644
--- a/indra/newview/llinventorylistitem.h
+++ b/indra/newview/llinventorylistitem.h
@@ -1,239 +1,239 @@
-/**
- * @file llinventorylistitem.h
- * @brief Inventory list item panel.
- *
- * Class LLPanelInventoryListItemBase displays inventory item as an element
- * of LLInventoryItemsList.
- *
- * $LicenseInfo:firstyear=2010&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_LLINVENTORYLISTITEM_H
-#define LL_LLINVENTORYLISTITEM_H
-
-// llcommon
-#include "llassettype.h"
-
-// llui
-#include "llpanel.h"
-#include "llstyle.h"
-#include "lliconctrl.h"
-#include "lltextbox.h"
-
-// newview
-#include "llwearabletype.h"
-
-class LLViewerInventoryItem;
-
-/**
- * @class LLPanelInventoryListItemBase
- *
- * Base class for Inventory flat list item. Panel consists of inventory icon
- * and inventory item name.
- * This class is able to display widgets(buttons) on left(before icon) and right(after text-box) sides 
- * of panel.
- *
- * How to use (see LLPanelClothingListItem for example):
- * - implement init() to build panel from xml
- * - create new xml file, fill it with widgets you want to dynamically show/hide/reshape on left/right sides
- * - redefine postBuild()(call base implementation) and add needed widgets to needed sides,
- *
- */
-class LLPanelInventoryListItemBase : public LLPanel
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLPanel::Params>
-	{
-		Optional<LLStyle::Params>	default_style,
-									worn_style;
-		Optional<LLUIImage*>		hover_image,
-									selected_image,
-									separator_image;
-		Optional<LLIconCtrl::Params>	item_icon;
-		Optional<LLTextBox::Params>		item_name;
-		Params();
-	};
-
-	typedef enum e_item_state {
-		IS_DEFAULT,
-		IS_WORN,
-	} EItemState;
-
-	static LLPanelInventoryListItemBase* create(LLViewerInventoryItem* item);
-
-	virtual void draw();
-
-	/**
-	 * Let item know it need to be refreshed in next draw()
-	 */
-	void setNeedsRefresh(bool needs_refresh){ mNeedsRefresh = needs_refresh; }
-
-	bool getNeedsRefresh(){ return mNeedsRefresh; }
-
-	/**
-	 * Add widget to left side
-	 */
-	void addWidgetToLeftSide(const std::string& name, bool show_widget = true);
-	void addWidgetToLeftSide(LLUICtrl* ctrl, bool show_widget = true);
-
-	/**
-	 * Add widget to right side, widget is supposed to be child of calling panel
-	 */
-	void addWidgetToRightSide(const std::string& name, bool show_widget = true);
-	void addWidgetToRightSide(LLUICtrl* ctrl, bool show_widget = true);
-
-	/**
-	 * Mark widgets as visible. Only visible widgets take part in reshaping children
-	 */
-	void setShowWidget(const std::string& name, bool show);
-	void setShowWidget(LLUICtrl* ctrl, bool show);
-
-	/**
-	 * Set spacing between widgets during reshape
-	 */
-	void setWidgetSpacing(S32 spacing) { mWidgetSpacing = spacing; }
-
-	S32 getWidgetSpacing() { return mWidgetSpacing; }
-
-	/**
-	 * Inheritors need to call base implementation of postBuild()
-	 */
-	/*virtual*/ bool postBuild();
-
-	/**
-	 * Handles item selection
-	 */
-	/*virtual*/ void setValue(const LLSD& value);
-
-	/**
-	 * Handles filter request
-	 */
-	/*virtual*/ S32  notify(const LLSD& info);
-
-	/* Highlights item */
-	/*virtual*/ bool handleHover(S32 x, S32 y, MASK mask);
-	/* Removes item highlight */
-	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
-
-	/** Get the name of a corresponding inventory item */
-	const std::string& getItemName() const;
-
-	/** Get the asset type of a corresponding inventory item */
-	LLAssetType::EType getType() const;
-
-	/** Get the wearable type of a corresponding inventory item */
-	LLWearableType::EType getWearableType() const;
-
-	/** Get the description of a corresponding inventory item */
-	const std::string& getDescription() const;
-
-	/** Get the creation date of a corresponding inventory item */
-	time_t getCreationDate() const;
-
-	/** Get the associated inventory item */
-	LLViewerInventoryItem* getItem() const;
-
-	void setSeparatorVisible(bool visible) { mSeparatorVisible = visible; }
-	void resetHighlight() { mHovered = false; }
-
-	virtual ~LLPanelInventoryListItemBase(){}
-
-protected:
-
-	LLPanelInventoryListItemBase(LLViewerInventoryItem* item, const Params& params);
-
-	typedef std::vector<LLUICtrl*> widget_array_t;
-
-	/**
-	 * Called after inventory item was updated, update panel widgets to reflect inventory changes.
-	 */
-	virtual void updateItem(const std::string& name,
-							EItemState item_state = IS_DEFAULT);
-
-	void setLeftWidgetsWidth(S32 width) { mLeftWidgetsWidth = width; }
-	void setRightWidgetsWidth(S32 width) { mRightWidgetsWidth = width; }
-
-	/**
-	 * Set all widgets from both side visible/invisible. Only enabled widgets
-	 * (see setShowWidget()) can become visible
-	 */
-	virtual void setWidgetsVisible(bool visible);
-
-	/**
-	 * Reshape all child widgets - icon, text-box and side widgets
-	 */
-	virtual void reshapeWidgets();
-
-	/** set wearable type icon image */
-	void setIconImage(const LLUIImagePtr& image);
-
-	/** Set item title - inventory item name usually */
-	void setTitle(const std::string& title,
-				  const std::string& highlit_text,
-				  EItemState item_state = IS_DEFAULT);
-
-	/**
-	 * Show tool tip if item name text size > panel size
-	 */
-	virtual bool handleToolTip( S32 x, S32 y, MASK mask);
-
-	const LLUUID mInventoryItemUUID;
-    bool mHovered;
-
-private:
-
-	/** reshape left side widgets
-	 * Deprecated for now. Disabled reshape left for now to reserve space for 'delete' 
-	 * button in LLPanelClothingListItem according to Neal's comment (https://codereview.productengine.com/secondlife/r/325/)
-	 */
-	void reshapeLeftWidgets();
-
-	/** reshape right side widgets */
-	void reshapeRightWidgets();
-
-	/** reshape remaining widgets */
-	void reshapeMiddleWidgets();
-
-
-	LLIconCtrl*		mIconCtrl;
-	LLTextBox*		mTitleCtrl;
-
-	LLUIImagePtr	mIconImage;
-	LLUIImagePtr	mHoverImage;
-	LLUIImagePtr	mSelectedImage;
-	LLUIImagePtr	mSeparatorImage;
-
-	bool			mSelected;
-	bool			mSeparatorVisible;
-
-	std::string		mHighlightedText;
-
-	widget_array_t	mLeftSideWidgets;
-	widget_array_t	mRightSideWidgets;
-	S32				mWidgetSpacing;
-
-	S32				mLeftWidgetsWidth;
-	S32				mRightWidgetsWidth;
-	bool			mNeedsRefresh;
-};
-
-#endif //LL_LLINVENTORYLISTITEM_H
+/**

+ * @file llinventorylistitem.h

+ * @brief Inventory list item panel.

+ *

+ * Class LLPanelInventoryListItemBase displays inventory item as an element

+ * of LLInventoryItemsList.

+ *

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

+#define LL_LLINVENTORYLISTITEM_H

+

+// llcommon

+#include "llassettype.h"

+

+// llui

+#include "llpanel.h"

+#include "llstyle.h"

+#include "lliconctrl.h"

+#include "lltextbox.h"

+

+// newview

+#include "llwearabletype.h"

+

+class LLViewerInventoryItem;

+

+/**

+ * @class LLPanelInventoryListItemBase

+ *

+ * Base class for Inventory flat list item. Panel consists of inventory icon

+ * and inventory item name.

+ * This class is able to display widgets(buttons) on left(before icon) and right(after text-box) sides

+ * of panel.

+ *

+ * How to use (see LLPanelClothingListItem for example):

+ * - implement init() to build panel from xml

+ * - create new xml file, fill it with widgets you want to dynamically show/hide/reshape on left/right sides

+ * - redefine postBuild()(call base implementation) and add needed widgets to needed sides,

+ *

+ */

+class LLPanelInventoryListItemBase : public LLPanel

+{

+public:

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

+    {

+        Optional<LLStyle::Params>   default_style,

+                                    worn_style;

+        Optional<LLUIImage*>        hover_image,

+                                    selected_image,

+                                    separator_image;

+        Optional<LLIconCtrl::Params>    item_icon;

+        Optional<LLTextBox::Params>     item_name;

+        Params();

+    };

+

+    typedef enum e_item_state {

+        IS_DEFAULT,

+        IS_WORN,

+    } EItemState;

+

+    static LLPanelInventoryListItemBase* create(LLViewerInventoryItem* item);

+

+    virtual void draw();

+

+    /**

+     * Let item know it need to be refreshed in next draw()

+     */

+    void setNeedsRefresh(bool needs_refresh){ mNeedsRefresh = needs_refresh; }

+

+    bool getNeedsRefresh(){ return mNeedsRefresh; }

+

+    /**

+     * Add widget to left side

+     */

+    void addWidgetToLeftSide(const std::string& name, bool show_widget = true);

+    void addWidgetToLeftSide(LLUICtrl* ctrl, bool show_widget = true);

+

+    /**

+     * Add widget to right side, widget is supposed to be child of calling panel

+     */

+    void addWidgetToRightSide(const std::string& name, bool show_widget = true);

+    void addWidgetToRightSide(LLUICtrl* ctrl, bool show_widget = true);

+

+    /**

+     * Mark widgets as visible. Only visible widgets take part in reshaping children

+     */

+    void setShowWidget(const std::string& name, bool show);

+    void setShowWidget(LLUICtrl* ctrl, bool show);

+

+    /**

+     * Set spacing between widgets during reshape

+     */

+    void setWidgetSpacing(S32 spacing) { mWidgetSpacing = spacing; }

+

+    S32 getWidgetSpacing() { return mWidgetSpacing; }

+

+    /**

+     * Inheritors need to call base implementation of postBuild()

+     */

+    /*virtual*/ bool postBuild();

+

+    /**

+     * Handles item selection

+     */

+    /*virtual*/ void setValue(const LLSD& value);

+

+    /**

+     * Handles filter request

+     */

+    /*virtual*/ S32  notify(const LLSD& info);

+

+    /* Highlights item */

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

+    /* Removes item highlight */

+    /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);

+

+    /** Get the name of a corresponding inventory item */

+    const std::string& getItemName() const;

+

+    /** Get the asset type of a corresponding inventory item */

+    LLAssetType::EType getType() const;

+

+    /** Get the wearable type of a corresponding inventory item */

+    LLWearableType::EType getWearableType() const;

+

+    /** Get the description of a corresponding inventory item */

+    const std::string& getDescription() const;

+

+    /** Get the creation date of a corresponding inventory item */

+    time_t getCreationDate() const;

+

+    /** Get the associated inventory item */

+    LLViewerInventoryItem* getItem() const;

+

+    void setSeparatorVisible(bool visible) { mSeparatorVisible = visible; }

+    void resetHighlight() { mHovered = false; }

+

+    virtual ~LLPanelInventoryListItemBase(){}

+

+protected:

+

+    LLPanelInventoryListItemBase(LLViewerInventoryItem* item, const Params& params);

+

+    typedef std::vector<LLUICtrl*> widget_array_t;

+

+    /**

+     * Called after inventory item was updated, update panel widgets to reflect inventory changes.

+     */

+    virtual void updateItem(const std::string& name,

+                            EItemState item_state = IS_DEFAULT);

+

+    void setLeftWidgetsWidth(S32 width) { mLeftWidgetsWidth = width; }

+    void setRightWidgetsWidth(S32 width) { mRightWidgetsWidth = width; }

+

+    /**

+     * Set all widgets from both side visible/invisible. Only enabled widgets

+     * (see setShowWidget()) can become visible

+     */

+    virtual void setWidgetsVisible(bool visible);

+

+    /**

+     * Reshape all child widgets - icon, text-box and side widgets

+     */

+    virtual void reshapeWidgets();

+

+    /** set wearable type icon image */

+    void setIconImage(const LLUIImagePtr& image);

+

+    /** Set item title - inventory item name usually */

+    void setTitle(const std::string& title,

+                  const std::string& highlit_text,

+                  EItemState item_state = IS_DEFAULT);

+

+    /**

+     * Show tool tip if item name text size > panel size

+     */

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

+

+    const LLUUID mInventoryItemUUID;

+    bool mHovered;

+

+private:

+

+    /** reshape left side widgets

+     * Deprecated for now. Disabled reshape left for now to reserve space for 'delete'

+     * button in LLPanelClothingListItem according to Neal's comment (https://codereview.productengine.com/secondlife/r/325/)

+     */

+    void reshapeLeftWidgets();

+

+    /** reshape right side widgets */

+    void reshapeRightWidgets();

+

+    /** reshape remaining widgets */

+    void reshapeMiddleWidgets();

+

+

+    LLIconCtrl*     mIconCtrl;

+    LLTextBox*      mTitleCtrl;

+

+    LLUIImagePtr    mIconImage;

+    LLUIImagePtr    mHoverImage;

+    LLUIImagePtr    mSelectedImage;

+    LLUIImagePtr    mSeparatorImage;

+

+    bool            mSelected;

+    bool            mSeparatorVisible;

+

+    std::string     mHighlightedText;

+

+    widget_array_t  mLeftSideWidgets;

+    widget_array_t  mRightSideWidgets;

+    S32             mWidgetSpacing;

+

+    S32             mLeftWidgetsWidth;

+    S32             mRightWidgetsWidth;

+    bool            mNeedsRefresh;

+};

+

+#endif //LL_LLINVENTORYLISTITEM_H