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

diff --git a/indra/newview/llsidepanelappearance.h b/indra/newview/llsidepanelappearance.h
index 4949f78a3f..fee4e2a5fd 100644
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@@ -1,102 +1,102 @@
-/** 
- * @file llsidepanelappearance.h
- * @brief Side Bar "Appearance" panel
- *
- * $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_LLSIDEPANELAPPEARANCE_H
-#define LL_LLSIDEPANELAPPEARANCE_H
-
-#include "llpanel.h"
-#include "llinventoryobserver.h"
-
-#include "llinventory.h"
-#include "llpaneloutfitedit.h"
-
-class LLFilterEditor;
-class LLCurrentlyWornFetchObserver;
-class LLPanelEditWearable;
-class LLViewerWearable;
-class LLPanelOutfitsInventory;
-
-class LLSidepanelAppearance : public LLPanel
-{
-	LOG_CLASS(LLSidepanelAppearance);
-public:
-	LLSidepanelAppearance();
-	virtual ~LLSidepanelAppearance();
-
-	/*virtual*/ bool postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);	
-
-	void refreshCurrentOutfitName(const std::string& name = "");
-
-	static void editWearable(LLViewerWearable *wearable, LLView *data, bool disable_camera_switch = false);
-
-	void fetchInventory();
-	void inventoryFetched();
-
-    void showOutfitsInventoryPanel(); // last selected
-	void showOutfitsInventoryPanel(const std::string& tab_name);
-	void showOutfitEditPanel();
-	void showWearableEditPanel(LLViewerWearable *wearable = NULL, bool disable_camera_switch = false);
-	void setWearablesLoading(bool val);
-	void showDefaultSubpart();
-	void updateScrollingPanelList();
-	void updateToVisibility( const LLSD& new_visibility );
-	LLPanelEditWearable* getWearable(){ return mEditWearable; }
-
-    bool isCOFPanelVisible();
-
-private:
-	void onFilterEdit(const std::string& search_string);
-	void onVisibilityChanged ( const LLSD& new_visibility );
-
-	void onOpenOutfitButtonClicked();
-	void onEditAppearanceButtonClicked();
-
-	void toggleMyOutfitsPanel(bool visible, const std::string& tab_name);
-	void toggleOutfitEditPanel(bool visible, bool disable_camera_switch = false);
-	void toggleWearableEditPanel(bool visible, LLViewerWearable* wearable = nullptr, bool disable_camera_switch = false);
-
-	LLFilterEditor*			mFilterEditor;
-	LLPanelOutfitsInventory* mPanelOutfitsInventory;
-	LLPanelOutfitEdit*		mOutfitEdit;
-	LLPanelEditWearable*	mEditWearable;
-
-	LLButton*					mOpenOutfitBtn;
-	LLButton*					mEditAppearanceBtn;
-	LLPanel*					mCurrOutfitPanel;
-
-	LLTextBox*					mCurrentLookName;
-	LLTextBox*					mOutfitStatus;
-
-	// Search string for filtering landmarks and teleport
-	// history locations
-	std::string					mFilterSubString;
-
-	// Gets set to true when we're opened for the first time.
-	bool mOpened;
-};
-
-#endif //LL_LLSIDEPANELAPPEARANCE_H
+/**

+ * @file llsidepanelappearance.h

+ * @brief Side Bar "Appearance" panel

+ *

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

+#define LL_LLSIDEPANELAPPEARANCE_H

+

+#include "llpanel.h"

+#include "llinventoryobserver.h"

+

+#include "llinventory.h"

+#include "llpaneloutfitedit.h"

+

+class LLFilterEditor;

+class LLCurrentlyWornFetchObserver;

+class LLPanelEditWearable;

+class LLViewerWearable;

+class LLPanelOutfitsInventory;

+

+class LLSidepanelAppearance : public LLPanel

+{

+    LOG_CLASS(LLSidepanelAppearance);

+public:

+    LLSidepanelAppearance();

+    virtual ~LLSidepanelAppearance();

+

+    /*virtual*/ bool postBuild();

+    /*virtual*/ void onOpen(const LLSD& key);

+

+    void refreshCurrentOutfitName(const std::string& name = "");

+

+    static void editWearable(LLViewerWearable *wearable, LLView *data, bool disable_camera_switch = false);

+

+    void fetchInventory();

+    void inventoryFetched();

+

+    void showOutfitsInventoryPanel(); // last selected

+    void showOutfitsInventoryPanel(const std::string& tab_name);

+    void showOutfitEditPanel();

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

+    void setWearablesLoading(bool val);

+    void showDefaultSubpart();

+    void updateScrollingPanelList();

+    void updateToVisibility( const LLSD& new_visibility );

+    LLPanelEditWearable* getWearable(){ return mEditWearable; }

+

+    bool isCOFPanelVisible();

+

+private:

+    void onFilterEdit(const std::string& search_string);

+    void onVisibilityChanged ( const LLSD& new_visibility );

+

+    void onOpenOutfitButtonClicked();

+    void onEditAppearanceButtonClicked();

+

+    void toggleMyOutfitsPanel(bool visible, const std::string& tab_name);

+    void toggleOutfitEditPanel(bool visible, bool disable_camera_switch = false);

+    void toggleWearableEditPanel(bool visible, LLViewerWearable* wearable = nullptr, bool disable_camera_switch = false);

+

+    LLFilterEditor*         mFilterEditor;

+    LLPanelOutfitsInventory* mPanelOutfitsInventory;

+    LLPanelOutfitEdit*      mOutfitEdit;

+    LLPanelEditWearable*    mEditWearable;

+

+    LLButton*                   mOpenOutfitBtn;

+    LLButton*                   mEditAppearanceBtn;

+    LLPanel*                    mCurrOutfitPanel;

+

+    LLTextBox*                  mCurrentLookName;

+    LLTextBox*                  mOutfitStatus;

+

+    // Search string for filtering landmarks and teleport

+    // history locations

+    std::string                 mFilterSubString;

+

+    // Gets set to true when we're opened for the first time.

+    bool mOpened;

+};

+

+#endif //LL_LLSIDEPANELAPPEARANCE_H