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

diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h
index 77619b5987..46df984ede 100644
--- a/indra/newview/llpaneleditwearable.h
+++ b/indra/newview/llpaneleditwearable.h
@@ -1,180 +1,180 @@
-/** 
- * @file llpaneleditwearable.h
- * @brief A LLPanel dedicated to the editing of wearables.
- *
- * $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$
- */
-
-#ifndef LL_LLPANELEDITWEARABLE_H
-#define LL_LLPANELEDITWEARABLE_H
-
-#include "llpanel.h"
-#include "llscrollingpanellist.h"
-#include "llmodaldialog.h"
-#include "llavatarappearancedefines.h"
-#include "llwearabletype.h"
-
-class LLAccordionCtrl;
-class LLCheckBoxCtrl;
-class LLViewerWearable;
-class LLTextBox;
-class LLViewerInventoryItem;
-class LLViewerVisualParam;
-class LLVisualParamHint;
-class LLViewerJointMesh;
-class LLAccordionCtrlTab;
-class LLJoint;
-class LLLineEditor;
-
-class LLPanelEditWearable : public LLPanel
-{
-public:
-	LLPanelEditWearable( );
-	virtual ~LLPanelEditWearable();
-
-	/*virtual*/ bool 		postBuild();
-	/*virtual*/ bool		isDirty() const;	// LLUICtrl
-	/*virtual*/ void		draw();	
-				void		onClose();
-
-	// changes camera angle to default for selected subpart
-	void				changeCamera(U8 subpart);
-
-	LLViewerWearable*	getWearable() { return mWearablePtr; }
-	void				setWearable(LLViewerWearable *wearable, bool disable_camera_switch = false);
-
-	void				saveChanges(bool force_save_as = false);
-	void				revertChanges();
-
-	void				showDefaultSubpart();
-	void				onTabExpandedCollapsed(const LLSD& param, U8 index);
-
-	void 				updateScrollingPanelList();
-
-	static void			onRevertButtonClicked(void* userdata);
-	static void			onBackButtonClicked(void* userdata); 
-	void				onCommitSexChange();
-	void				onSaveAsButtonClicked();
-	void				saveAsCallback(const LLSD& notification, const LLSD& response);
-
-	virtual void		setVisible(bool visible);
-
-private:
-	typedef std::map<F32, LLViewerVisualParam*> value_map_t;
-
-	void				showWearable(LLViewerWearable* wearable, bool show, bool disable_camera_switch = false);
-	void				updateScrollingPanelUI();
-	LLPanel*			getPanel(LLWearableType::EType type);
-	void				getSortedParams(value_map_t &sorted_params, const std::string &edit_group);
-	void				buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab, LLJoint* jointp);
-	// update bottom bar buttons ("Save", "Revert", etc)
-	void				updateVerbs();
-
-	void				onColorSwatchCommit(const LLUICtrl*);
-	void				onTexturePickerCommit(const LLUICtrl*);
-	void				updatePanelPickerControls(LLWearableType::EType type);
-	void				toggleTypeSpecificControls(LLWearableType::EType type);
-	void				updateTypeSpecificControls(LLWearableType::EType type);
-
-	//alpha mask checkboxes
-	void configureAlphaCheckbox(LLAvatarAppearanceDefines::ETextureIndex te, const std::string& name);
-	void onInvisibilityCommit(LLCheckBoxCtrl* checkbox_ctrl, LLAvatarAppearanceDefines::ETextureIndex te);
-	void updateAlphaCheckboxes();
-	void initPreviousAlphaTextures();
-	void initPreviousAlphaTextureEntry(LLAvatarAppearanceDefines::ETextureIndex te);
-
-	// callback for HeightUnits parameter.
-	bool changeHeightUnits(const LLSD& new_value);
-
-	// updates current metric and replacement metric label text
-	void updateMetricLayout(bool new_value);
-
-	// updates avatar height label
-	void updateAvatarHeightLabel();
-
-	void onWearablePanelVisibilityChange(const LLSD &in_visible_chain, LLAccordionCtrl* accordion_ctrl);
-
-	void setWearablePanelVisibilityChangeCallback(LLPanel* bodypart_panel);
-
-	// *HACK Remove this when serverside texture baking is available on all regions.
-	void incrementCofVersionLegacy();
-
-	// the pointer to the wearable we're editing. NULL means we're not editing a wearable.
-	LLViewerWearable *mWearablePtr;
-	LLViewerInventoryItem* mWearableItem;
-
-	// these are constant no matter what wearable we're editing
-	LLButton *mBtnRevert;
-	LLButton *mBtnBack;
-	std::string mBackBtnLabel;
-
-	LLTextBox *mPanelTitle;
-	LLTextBox *mDescTitle;
-	LLTextBox *mTxtAvatarHeight;
-
-
-	// localized and parameterized strings that used to build avatar_height_label
-	std::string mMeters;
-	std::string mFeet;
-	std::string mHeight;
-	LLUIString  mHeightValue;
-	LLUIString  mReplacementMetricUrl;
-
-	// color for mHeight string
-	LLUIColor mAvatarHeightLabelColor;
-	// color for mHeightValue string
-	LLUIColor mAvatarHeightValueLabelColor;
-
-	// This text editor reference will change each time we edit a new wearable - 
-	// it will be grabbed from the currently visible panel
-	LLLineEditor *mNameEditor;
-
-	// The following panels will be shown/hidden based on what wearable we're editing
-	// body parts
-	LLPanel *mPanelShape;
-	LLPanel *mPanelSkin;
-	LLPanel *mPanelEyes;
-	LLPanel *mPanelHair;
-
-	//clothes
-	LLPanel *mPanelShirt;
-	LLPanel *mPanelPants;
-	LLPanel *mPanelShoes;
-	LLPanel *mPanelSocks;
-	LLPanel *mPanelJacket;
-	LLPanel *mPanelGloves;
-	LLPanel *mPanelUndershirt;
-	LLPanel *mPanelUnderpants;
-	LLPanel *mPanelSkirt;
-	LLPanel *mPanelAlpha;
-	LLPanel *mPanelTattoo;
-	LLPanel *mPanelUniversal;
-	LLPanel *mPanelPhysics;
-
-	typedef std::map<std::string, LLAvatarAppearanceDefines::ETextureIndex> string_texture_index_map_t;
-	string_texture_index_map_t mAlphaCheckbox2Index;
-
-	typedef std::map<LLAvatarAppearanceDefines::ETextureIndex, LLUUID> s32_uuid_map_t;
-	s32_uuid_map_t mPreviousAlphaTexture;
-};
-
-#endif
+/**

+ * @file llpaneleditwearable.h

+ * @brief A LLPanel dedicated to the editing of wearables.

+ *

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

+ */

+

+#ifndef LL_LLPANELEDITWEARABLE_H

+#define LL_LLPANELEDITWEARABLE_H

+

+#include "llpanel.h"

+#include "llscrollingpanellist.h"

+#include "llmodaldialog.h"

+#include "llavatarappearancedefines.h"

+#include "llwearabletype.h"

+

+class LLAccordionCtrl;

+class LLCheckBoxCtrl;

+class LLViewerWearable;

+class LLTextBox;

+class LLViewerInventoryItem;

+class LLViewerVisualParam;

+class LLVisualParamHint;

+class LLViewerJointMesh;

+class LLAccordionCtrlTab;

+class LLJoint;

+class LLLineEditor;

+

+class LLPanelEditWearable : public LLPanel

+{

+public:

+    LLPanelEditWearable( );

+    virtual ~LLPanelEditWearable();

+

+    /*virtual*/ bool        postBuild();

+    /*virtual*/ bool        isDirty() const;    // LLUICtrl

+    /*virtual*/ void        draw();

+                void        onClose();

+

+    // changes camera angle to default for selected subpart

+    void                changeCamera(U8 subpart);

+

+    LLViewerWearable*   getWearable() { return mWearablePtr; }

+    void                setWearable(LLViewerWearable *wearable, bool disable_camera_switch = false);

+

+    void                saveChanges(bool force_save_as = false);

+    void                revertChanges();

+

+    void                showDefaultSubpart();

+    void                onTabExpandedCollapsed(const LLSD& param, U8 index);

+

+    void                updateScrollingPanelList();

+

+    static void         onRevertButtonClicked(void* userdata);

+    static void         onBackButtonClicked(void* userdata);

+    void                onCommitSexChange();

+    void                onSaveAsButtonClicked();

+    void                saveAsCallback(const LLSD& notification, const LLSD& response);

+

+    virtual void        setVisible(bool visible);

+

+private:

+    typedef std::map<F32, LLViewerVisualParam*> value_map_t;

+

+    void                showWearable(LLViewerWearable* wearable, bool show, bool disable_camera_switch = false);

+    void                updateScrollingPanelUI();

+    LLPanel*            getPanel(LLWearableType::EType type);

+    void                getSortedParams(value_map_t &sorted_params, const std::string &edit_group);

+    void                buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab, LLJoint* jointp);

+    // update bottom bar buttons ("Save", "Revert", etc)

+    void                updateVerbs();

+

+    void                onColorSwatchCommit(const LLUICtrl*);

+    void                onTexturePickerCommit(const LLUICtrl*);

+    void                updatePanelPickerControls(LLWearableType::EType type);

+    void                toggleTypeSpecificControls(LLWearableType::EType type);

+    void                updateTypeSpecificControls(LLWearableType::EType type);

+

+    //alpha mask checkboxes

+    void configureAlphaCheckbox(LLAvatarAppearanceDefines::ETextureIndex te, const std::string& name);

+    void onInvisibilityCommit(LLCheckBoxCtrl* checkbox_ctrl, LLAvatarAppearanceDefines::ETextureIndex te);

+    void updateAlphaCheckboxes();

+    void initPreviousAlphaTextures();

+    void initPreviousAlphaTextureEntry(LLAvatarAppearanceDefines::ETextureIndex te);

+

+    // callback for HeightUnits parameter.

+    bool changeHeightUnits(const LLSD& new_value);

+

+    // updates current metric and replacement metric label text

+    void updateMetricLayout(bool new_value);

+

+    // updates avatar height label

+    void updateAvatarHeightLabel();

+

+    void onWearablePanelVisibilityChange(const LLSD &in_visible_chain, LLAccordionCtrl* accordion_ctrl);

+

+    void setWearablePanelVisibilityChangeCallback(LLPanel* bodypart_panel);

+

+    // *HACK Remove this when serverside texture baking is available on all regions.

+    void incrementCofVersionLegacy();

+

+    // the pointer to the wearable we're editing. NULL means we're not editing a wearable.

+    LLViewerWearable *mWearablePtr;

+    LLViewerInventoryItem* mWearableItem;

+

+    // these are constant no matter what wearable we're editing

+    LLButton *mBtnRevert;

+    LLButton *mBtnBack;

+    std::string mBackBtnLabel;

+

+    LLTextBox *mPanelTitle;

+    LLTextBox *mDescTitle;

+    LLTextBox *mTxtAvatarHeight;

+

+

+    // localized and parameterized strings that used to build avatar_height_label

+    std::string mMeters;

+    std::string mFeet;

+    std::string mHeight;

+    LLUIString  mHeightValue;

+    LLUIString  mReplacementMetricUrl;

+

+    // color for mHeight string

+    LLUIColor mAvatarHeightLabelColor;

+    // color for mHeightValue string

+    LLUIColor mAvatarHeightValueLabelColor;

+

+    // This text editor reference will change each time we edit a new wearable -

+    // it will be grabbed from the currently visible panel

+    LLLineEditor *mNameEditor;

+

+    // The following panels will be shown/hidden based on what wearable we're editing

+    // body parts

+    LLPanel *mPanelShape;

+    LLPanel *mPanelSkin;

+    LLPanel *mPanelEyes;

+    LLPanel *mPanelHair;

+

+    //clothes

+    LLPanel *mPanelShirt;

+    LLPanel *mPanelPants;

+    LLPanel *mPanelShoes;

+    LLPanel *mPanelSocks;

+    LLPanel *mPanelJacket;

+    LLPanel *mPanelGloves;

+    LLPanel *mPanelUndershirt;

+    LLPanel *mPanelUnderpants;

+    LLPanel *mPanelSkirt;

+    LLPanel *mPanelAlpha;

+    LLPanel *mPanelTattoo;

+    LLPanel *mPanelUniversal;

+    LLPanel *mPanelPhysics;

+

+    typedef std::map<std::string, LLAvatarAppearanceDefines::ETextureIndex> string_texture_index_map_t;

+    string_texture_index_map_t mAlphaCheckbox2Index;

+

+    typedef std::map<LLAvatarAppearanceDefines::ETextureIndex, LLUUID> s32_uuid_map_t;

+    s32_uuid_map_t mPreviousAlphaTexture;

+};

+

+#endif