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

diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
index 4009b7a67c..148fdd0a7d 100644
--- a/indra/newview/llsidepanelinventory.h
+++ b/indra/newview/llsidepanelinventory.h
@@ -1,119 +1,119 @@
-/** 
- * @file LLSidepanelInventory.h
- * @brief Side Bar "Inventory" 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_LLSIDEPANELINVENTORY_H
-#define LL_LLSIDEPANELINVENTORY_H
-
-#include "llpanel.h"
-
-class LLButton;
-class LLFolderViewItem;
-class LLInboxAddedObserver;
-class LLInventoryCategoriesObserver;
-class LLInventoryItem;
-class LLInventoryPanel;
-class LLLayoutPanel;
-class LLPanelMainInventory;
-class LLSidepanelItemInfo;
-class LLSidepanelTaskInfo;
-
-class LLSidepanelInventory : public LLPanel
-{
-public:
-	LLSidepanelInventory();
-	virtual ~LLSidepanelInventory();
-
-private:
-	void updateInbox();
-	
-public:
-	void observeInboxCreation();
-	void observeInboxModifications(const LLUUID& inboxID);
-
-	/*virtual*/ bool postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-
-	LLInventoryPanel* getActivePanel(); // Returns an active inventory panel, if any.
-	void selectAllItemsPanel();
-	LLInventoryPanel* getInboxPanel() const { return mInventoryPanelInbox.get(); }
-
-	LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; }
-	bool isMainInventoryPanelActive() const;
-
-	void clearSelections(bool clearMain, bool clearInbox);
-    std::set<LLFolderViewItem*> getInboxSelectionList();
-
-	void showInventoryPanel();
-    void initInventoryViews();
-
-	// checks can share selected item(s)
-	bool canShare();
-
-	void onToggleInboxBtn();
-
-	void enableInbox(bool enabled);
-    void toggleInbox();
-    void hideInbox();
-	
-	void openInbox();
-	
-	bool isInboxEnabled() const { return mInboxEnabled; }
-
-	static void cleanup();
-
-protected:
-	// Tracks highlighted (selected) item in inventory panel.
-	LLInventoryItem *getSelectedItem();
-	U32 getSelectedCount();
-	void onSelectionChange(const std::deque<LLFolderViewItem*> &items, bool user_action);
-	// "wear", "teleport", etc.
-	void performActionOnSelection(const std::string &action);
-
-	bool canWearSelected(); // check whether selected items can be worn
-
-	void onInboxChanged(const LLUUID& inbox_id);
-
-	//
-	// UI Elements
-	//
-private:
-	LLPanel*					mInventoryPanel; // Main inventory view
-	LLHandle<LLInventoryPanel>	mInventoryPanelInbox;
-	LLPanelMainInventory*		mPanelMainInventory;
-
-    LLLayoutPanel* mInboxLayoutPanel;
-
-protected:
-	void 						onBackButtonClicked();
-
-private:
-	bool						mInboxEnabled;
-
-	LLInventoryCategoriesObserver* 	mCategoriesObserver;
-	LLInboxAddedObserver*			mInboxAddedObserver;
-};
-
-#endif //LL_LLSIDEPANELINVENTORY_H
+/**

+ * @file LLSidepanelInventory.h

+ * @brief Side Bar "Inventory" 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_LLSIDEPANELINVENTORY_H

+#define LL_LLSIDEPANELINVENTORY_H

+

+#include "llpanel.h"

+

+class LLButton;

+class LLFolderViewItem;

+class LLInboxAddedObserver;

+class LLInventoryCategoriesObserver;

+class LLInventoryItem;

+class LLInventoryPanel;

+class LLLayoutPanel;

+class LLPanelMainInventory;

+class LLSidepanelItemInfo;

+class LLSidepanelTaskInfo;

+

+class LLSidepanelInventory : public LLPanel

+{

+public:

+    LLSidepanelInventory();

+    virtual ~LLSidepanelInventory();

+

+private:

+    void updateInbox();

+

+public:

+    void observeInboxCreation();

+    void observeInboxModifications(const LLUUID& inboxID);

+

+    /*virtual*/ bool postBuild();

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

+

+    LLInventoryPanel* getActivePanel(); // Returns an active inventory panel, if any.

+    void selectAllItemsPanel();

+    LLInventoryPanel* getInboxPanel() const { return mInventoryPanelInbox.get(); }

+

+    LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; }

+    bool isMainInventoryPanelActive() const;

+

+    void clearSelections(bool clearMain, bool clearInbox);

+    std::set<LLFolderViewItem*> getInboxSelectionList();

+

+    void showInventoryPanel();

+    void initInventoryViews();

+

+    // checks can share selected item(s)

+    bool canShare();

+

+    void onToggleInboxBtn();

+

+    void enableInbox(bool enabled);

+    void toggleInbox();

+    void hideInbox();

+

+    void openInbox();

+

+    bool isInboxEnabled() const { return mInboxEnabled; }

+

+    static void cleanup();

+

+protected:

+    // Tracks highlighted (selected) item in inventory panel.

+    LLInventoryItem *getSelectedItem();

+    U32 getSelectedCount();

+    void onSelectionChange(const std::deque<LLFolderViewItem*> &items, bool user_action);

+    // "wear", "teleport", etc.

+    void performActionOnSelection(const std::string &action);

+

+    bool canWearSelected(); // check whether selected items can be worn

+

+    void onInboxChanged(const LLUUID& inbox_id);

+

+    //

+    // UI Elements

+    //

+private:

+    LLPanel*                    mInventoryPanel; // Main inventory view

+    LLHandle<LLInventoryPanel>  mInventoryPanelInbox;

+    LLPanelMainInventory*       mPanelMainInventory;

+

+    LLLayoutPanel* mInboxLayoutPanel;

+

+protected:

+    void                        onBackButtonClicked();

+

+private:

+    bool                        mInboxEnabled;

+

+    LLInventoryCategoriesObserver*  mCategoriesObserver;

+    LLInboxAddedObserver*           mInboxAddedObserver;

+};

+

+#endif //LL_LLSIDEPANELINVENTORY_H