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

diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 929a8ef555..38ce3197e9 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -1,293 +1,293 @@
-/** 
- * @file llinventory.h
- * @brief LLInventoryItem and LLInventoryCategory class declaration.
- *
- * $LicenseInfo:firstyear=2001&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_LLINVENTORY_H
-#define LL_LLINVENTORY_H
-
-#include "llfoldertype.h"
-#include "llinventorytype.h"
-#include "llpermissions.h"
-#include "llrefcount.h"
-#include "llsaleinfo.h"
-#include "llsd.h"
-#include "lluuid.h"
-#include "lltrace.h"
-
-class LLMessageSystem;
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLInventoryObject
-//
-//   Base class for anything in the user's inventory.   Handles the common code 
-//   between items and categories. 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLInventoryObject : public LLRefCount
-{
-public:
-	typedef std::list<LLPointer<LLInventoryObject> > object_list_t;
-	typedef std::list<LLConstPointer<LLInventoryObject> > const_object_list_t;
-
-	//--------------------------------------------------------------------
-	// Initialization
-	//--------------------------------------------------------------------
-public:
-	LLInventoryObject();
-	LLInventoryObject(const LLUUID& uuid, 
-					  const LLUUID& parent_uuid,
-					  LLAssetType::EType type, 
-					  const std::string& name);
-	void copyObject(const LLInventoryObject* other); // LLRefCount requires custom copy
-protected:
-	virtual ~LLInventoryObject();
-
-	//--------------------------------------------------------------------
-	// Accessors
-	//--------------------------------------------------------------------
-public:
-	virtual const LLUUID& getUUID() const; // inventoryID that this item points to
-	virtual const LLUUID& getLinkedUUID() const; // inventoryID that this item points to, else this item's inventoryID
-	const LLUUID& getParentUUID() const;
-	virtual const LLUUID& getThumbnailUUID() const;
-	virtual const std::string& getName() const;
-	virtual LLAssetType::EType getType() const;
-	LLAssetType::EType getActualType() const; // bypasses indirection for linked items
-	bool getIsLinkType() const;
-	virtual time_t getCreationDate() const;
-	
-	//--------------------------------------------------------------------
-	// Mutators
-	//   Will not call updateServer
-	//--------------------------------------------------------------------
-public:
-	void setUUID(const LLUUID& new_uuid);
-	virtual void rename(const std::string& new_name);
-	void setParent(const LLUUID& new_parent);
-	virtual void setThumbnailUUID(const LLUUID& thumbnail_uuid);
-	void setType(LLAssetType::EType type);
-	virtual void setCreationDate(time_t creation_date_utc); // only stored for items
-
-	// in place correction for inventory name string
-	static void correctInventoryName(std::string& name);
-
-	//--------------------------------------------------------------------
-	// File Support
-	//   Implemented here so that a minimal information set can be transmitted
-	//   between simulator and viewer.
-	//--------------------------------------------------------------------
-
-	virtual bool importLegacyStream(std::istream& input_stream);
-	virtual bool exportLegacyStream(std::ostream& output_stream, bool include_asset_key = true) const;
-
-	virtual void updateParentOnServer(bool) const;
-	virtual void updateServer(bool) const;
-
-	//--------------------------------------------------------------------
-	// Member Variables
-	//--------------------------------------------------------------------
-protected:
-	LLUUID mUUID;
-	LLUUID mParentUUID; // Parent category.  Root categories have LLUUID::NULL.
-	LLUUID mThumbnailUUID;
-	LLAssetType::EType mType;
-	std::string mName;
-	time_t mCreationDate; // seconds from 1/1/1970, UTC
-};
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLInventoryItem
-//
-//   An item in the current user's inventory.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLInventoryItem : public LLInventoryObject
-{
-public:
-	typedef std::vector<LLPointer<LLInventoryItem> > item_array_t;
-
-	//--------------------------------------------------------------------
-	// Initialization
-	//--------------------------------------------------------------------
-public:
-	LLInventoryItem(const LLUUID& uuid,
-					const LLUUID& parent_uuid,
-					const LLPermissions& permissions,
-					const LLUUID& asset_uuid,
-					LLAssetType::EType type,
-					LLInventoryType::EType inv_type,
-					const std::string& name, 
-					const std::string& desc,
-					const LLSaleInfo& sale_info,
-					U32 flags,
-					S32 creation_date_utc);
-	LLInventoryItem();
-	// Create a copy of an inventory item from a pointer to another item
-	// Note: Because InventoryItems are ref counted, reference copy (a = b)
-	// is prohibited
-	LLInventoryItem(const LLInventoryItem* other);
-	virtual void copyItem(const LLInventoryItem* other); // LLRefCount requires custom copy
-	void generateUUID() { mUUID.generate(); }
-protected:
-	~LLInventoryItem(); // ref counted
-	
-	//--------------------------------------------------------------------
-	// Accessors
-	//--------------------------------------------------------------------
-public:
-	virtual const LLUUID& getLinkedUUID() const;
-	virtual const LLPermissions& getPermissions() const;
-	virtual const LLUUID& getCreatorUUID() const;
-	virtual const LLUUID& getAssetUUID() const;
-	virtual const std::string& getDescription() const;
-	virtual const std::string& getActualDescription() const; // Does not follow links
-	virtual const LLSaleInfo& getSaleInfo() const;
-	virtual LLInventoryType::EType getInventoryType() const;
-	virtual U32 getFlags() const;
-	virtual time_t getCreationDate() const;
-	virtual U32 getCRC32() const; // really more of a checksum.
-	
-	//--------------------------------------------------------------------
-	// Mutators
-	//   Will not call updateServer and will never fail
-	//   (though it may correct to sane values)
-	//--------------------------------------------------------------------
-public:
-	void setAssetUUID(const LLUUID& asset_id);
-	static void correctInventoryDescription(std::string& name);
-	void setDescription(const std::string& new_desc);
-	void setSaleInfo(const LLSaleInfo& sale_info);
-	void setPermissions(const LLPermissions& perm);
-	void setInventoryType(LLInventoryType::EType inv_type);
-	void setFlags(U32 flags);
-	void setCreator(const LLUUID& creator); // only used for calling cards
-
-	// Check for changes in permissions masks and sale info
-	// and set the corresponding bits in mFlags.
-	void accumulatePermissionSlamBits(const LLInventoryItem& old_item);
-
-	// Put this inventory item onto the current outgoing mesage.
-	// Assumes you have already called nextBlock().
-	virtual void packMessage(LLMessageSystem* msg) const;
-
-	// Returns true if the inventory item came through the network correctly.
-	// Uses a simple crc check which is defeatable, but we want to detect 
-	// network mangling somehow.
-	virtual bool unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
-
-	//--------------------------------------------------------------------
-	// File Support
-	//--------------------------------------------------------------------
-public:
-	virtual bool importLegacyStream(std::istream& input_stream);
-	virtual bool exportLegacyStream(std::ostream& output_stream, bool include_asset_key = true) const;
-
-	//--------------------------------------------------------------------
-	// Helper Functions
-	//--------------------------------------------------------------------
-public:
-	LLSD asLLSD() const;
-	void asLLSD( LLSD& sd ) const;
-	bool fromLLSD(const LLSD& sd, bool is_new = true);
-
-	//--------------------------------------------------------------------
-	// Member Variables
-	//--------------------------------------------------------------------
-protected:
-	LLPermissions mPermissions;
-	LLUUID mAssetUUID;
-	std::string mDescription;
-	LLSaleInfo mSaleInfo;
-	LLInventoryType::EType mInventoryType;
-	U32 mFlags;
-};
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLInventoryCategory
-//
-//   A category/folder of inventory items. Users come with a set of default 
-//   categories, and can create new ones as needed.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLInventoryCategory : public LLInventoryObject
-{
-public:
-	typedef std::vector<LLPointer<LLInventoryCategory> > cat_array_t;
-
-	//--------------------------------------------------------------------
-	// Initialization
-	//--------------------------------------------------------------------
-public:
-	LLInventoryCategory(const LLUUID& uuid, const LLUUID& parent_uuid,
-						LLFolderType::EType preferred_type,
-						const std::string& name);
-	LLInventoryCategory();
-	LLInventoryCategory(const LLInventoryCategory* other);
-	void copyCategory(const LLInventoryCategory* other); // LLRefCount requires custom copy
-protected:
-	virtual ~LLInventoryCategory();
-
-	//--------------------------------------------------------------------
-	// Accessors And Mutators
-	//--------------------------------------------------------------------
-public:
-	LLFolderType::EType getPreferredType() const;
-	void setPreferredType(LLFolderType::EType type);
-	LLSD asLLSD() const;
-    LLSD asAISCreateCatLLSD() const;
-	bool fromLLSD(const LLSD& sd);
-
-	//--------------------------------------------------------------------
-	// Messaging
-	//--------------------------------------------------------------------
-public:
-	virtual void packMessage(LLMessageSystem* msg) const;
-	virtual void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
-
-	//--------------------------------------------------------------------
-	// File Support
-	//--------------------------------------------------------------------
-public:
-	virtual bool importLegacyStream(std::istream& input_stream);
-	virtual bool exportLegacyStream(std::ostream& output_stream, bool include_asset_key = true) const;
-
-	LLSD exportLLSD() const;
-	bool importLLSD(const LLSD& cat_data);
-	//--------------------------------------------------------------------
-	// Member Variables
-	//--------------------------------------------------------------------
-protected:
-	LLFolderType::EType	mPreferredType; // Type that this category was "meant" to hold (although it may hold any type).	
-};
-
-
-//-----------------------------------------------------------------------------
-// Convertors
-//
-//   These functions convert between structured data and an inventory
-//   item, appropriate for serialization.
-//-----------------------------------------------------------------------------
-LLSD ll_create_sd_from_inventory_item(LLPointer<LLInventoryItem> item);
-LLSD ll_create_sd_from_inventory_category(LLPointer<LLInventoryCategory> cat);
-LLPointer<LLInventoryCategory> ll_create_category_from_sd(const LLSD& sd_cat);
-
-#endif // LL_LLINVENTORY_H
+/**

+ * @file llinventory.h

+ * @brief LLInventoryItem and LLInventoryCategory class declaration.

+ *

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

+#define LL_LLINVENTORY_H

+

+#include "llfoldertype.h"

+#include "llinventorytype.h"

+#include "llpermissions.h"

+#include "llrefcount.h"

+#include "llsaleinfo.h"

+#include "llsd.h"

+#include "lluuid.h"

+#include "lltrace.h"

+

+class LLMessageSystem;

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLInventoryObject

+//

+//   Base class for anything in the user's inventory.   Handles the common code

+//   between items and categories.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLInventoryObject : public LLRefCount

+{

+public:

+    typedef std::list<LLPointer<LLInventoryObject> > object_list_t;

+    typedef std::list<LLConstPointer<LLInventoryObject> > const_object_list_t;

+

+    //--------------------------------------------------------------------

+    // Initialization

+    //--------------------------------------------------------------------

+public:

+    LLInventoryObject();

+    LLInventoryObject(const LLUUID& uuid,

+                      const LLUUID& parent_uuid,

+                      LLAssetType::EType type,

+                      const std::string& name);

+    void copyObject(const LLInventoryObject* other); // LLRefCount requires custom copy

+protected:

+    virtual ~LLInventoryObject();

+

+    //--------------------------------------------------------------------

+    // Accessors

+    //--------------------------------------------------------------------

+public:

+    virtual const LLUUID& getUUID() const; // inventoryID that this item points to

+    virtual const LLUUID& getLinkedUUID() const; // inventoryID that this item points to, else this item's inventoryID

+    const LLUUID& getParentUUID() const;

+    virtual const LLUUID& getThumbnailUUID() const;

+    virtual const std::string& getName() const;

+    virtual LLAssetType::EType getType() const;

+    LLAssetType::EType getActualType() const; // bypasses indirection for linked items

+    bool getIsLinkType() const;

+    virtual time_t getCreationDate() const;

+

+    //--------------------------------------------------------------------

+    // Mutators

+    //   Will not call updateServer

+    //--------------------------------------------------------------------

+public:

+    void setUUID(const LLUUID& new_uuid);

+    virtual void rename(const std::string& new_name);

+    void setParent(const LLUUID& new_parent);

+    virtual void setThumbnailUUID(const LLUUID& thumbnail_uuid);

+    void setType(LLAssetType::EType type);

+    virtual void setCreationDate(time_t creation_date_utc); // only stored for items

+

+    // in place correction for inventory name string

+    static void correctInventoryName(std::string& name);

+

+    //--------------------------------------------------------------------

+    // File Support

+    //   Implemented here so that a minimal information set can be transmitted

+    //   between simulator and viewer.

+    //--------------------------------------------------------------------

+

+    virtual bool importLegacyStream(std::istream& input_stream);

+    virtual bool exportLegacyStream(std::ostream& output_stream, bool include_asset_key = true) const;

+

+    virtual void updateParentOnServer(bool) const;

+    virtual void updateServer(bool) const;

+

+    //--------------------------------------------------------------------

+    // Member Variables

+    //--------------------------------------------------------------------

+protected:

+    LLUUID mUUID;

+    LLUUID mParentUUID; // Parent category.  Root categories have LLUUID::NULL.

+    LLUUID mThumbnailUUID;

+    LLAssetType::EType mType;

+    std::string mName;

+    time_t mCreationDate; // seconds from 1/1/1970, UTC

+};

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLInventoryItem

+//

+//   An item in the current user's inventory.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLInventoryItem : public LLInventoryObject

+{

+public:

+    typedef std::vector<LLPointer<LLInventoryItem> > item_array_t;

+

+    //--------------------------------------------------------------------

+    // Initialization

+    //--------------------------------------------------------------------

+public:

+    LLInventoryItem(const LLUUID& uuid,

+                    const LLUUID& parent_uuid,

+                    const LLPermissions& permissions,

+                    const LLUUID& asset_uuid,

+                    LLAssetType::EType type,

+                    LLInventoryType::EType inv_type,

+                    const std::string& name,

+                    const std::string& desc,

+                    const LLSaleInfo& sale_info,

+                    U32 flags,

+                    S32 creation_date_utc);

+    LLInventoryItem();

+    // Create a copy of an inventory item from a pointer to another item

+    // Note: Because InventoryItems are ref counted, reference copy (a = b)

+    // is prohibited

+    LLInventoryItem(const LLInventoryItem* other);

+    virtual void copyItem(const LLInventoryItem* other); // LLRefCount requires custom copy

+    void generateUUID() { mUUID.generate(); }

+protected:

+    ~LLInventoryItem(); // ref counted

+

+    //--------------------------------------------------------------------

+    // Accessors

+    //--------------------------------------------------------------------

+public:

+    virtual const LLUUID& getLinkedUUID() const;

+    virtual const LLPermissions& getPermissions() const;

+    virtual const LLUUID& getCreatorUUID() const;

+    virtual const LLUUID& getAssetUUID() const;

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

+    virtual const std::string& getActualDescription() const; // Does not follow links

+    virtual const LLSaleInfo& getSaleInfo() const;

+    virtual LLInventoryType::EType getInventoryType() const;

+    virtual U32 getFlags() const;

+    virtual time_t getCreationDate() const;

+    virtual U32 getCRC32() const; // really more of a checksum.

+

+    //--------------------------------------------------------------------

+    // Mutators

+    //   Will not call updateServer and will never fail

+    //   (though it may correct to sane values)

+    //--------------------------------------------------------------------

+public:

+    void setAssetUUID(const LLUUID& asset_id);

+    static void correctInventoryDescription(std::string& name);

+    void setDescription(const std::string& new_desc);

+    void setSaleInfo(const LLSaleInfo& sale_info);

+    void setPermissions(const LLPermissions& perm);

+    void setInventoryType(LLInventoryType::EType inv_type);

+    void setFlags(U32 flags);

+    void setCreator(const LLUUID& creator); // only used for calling cards

+

+    // Check for changes in permissions masks and sale info

+    // and set the corresponding bits in mFlags.

+    void accumulatePermissionSlamBits(const LLInventoryItem& old_item);

+

+    // Put this inventory item onto the current outgoing mesage.

+    // Assumes you have already called nextBlock().

+    virtual void packMessage(LLMessageSystem* msg) const;

+

+    // Returns true if the inventory item came through the network correctly.

+    // Uses a simple crc check which is defeatable, but we want to detect

+    // network mangling somehow.

+    virtual bool unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);

+

+    //--------------------------------------------------------------------

+    // File Support

+    //--------------------------------------------------------------------

+public:

+    virtual bool importLegacyStream(std::istream& input_stream);

+    virtual bool exportLegacyStream(std::ostream& output_stream, bool include_asset_key = true) const;

+

+    //--------------------------------------------------------------------

+    // Helper Functions

+    //--------------------------------------------------------------------

+public:

+    LLSD asLLSD() const;

+    void asLLSD( LLSD& sd ) const;

+    bool fromLLSD(const LLSD& sd, bool is_new = true);

+

+    //--------------------------------------------------------------------

+    // Member Variables

+    //--------------------------------------------------------------------

+protected:

+    LLPermissions mPermissions;

+    LLUUID mAssetUUID;

+    std::string mDescription;

+    LLSaleInfo mSaleInfo;

+    LLInventoryType::EType mInventoryType;

+    U32 mFlags;

+};

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLInventoryCategory

+//

+//   A category/folder of inventory items. Users come with a set of default

+//   categories, and can create new ones as needed.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+class LLInventoryCategory : public LLInventoryObject

+{

+public:

+    typedef std::vector<LLPointer<LLInventoryCategory> > cat_array_t;

+

+    //--------------------------------------------------------------------

+    // Initialization

+    //--------------------------------------------------------------------

+public:

+    LLInventoryCategory(const LLUUID& uuid, const LLUUID& parent_uuid,

+                        LLFolderType::EType preferred_type,

+                        const std::string& name);

+    LLInventoryCategory();

+    LLInventoryCategory(const LLInventoryCategory* other);

+    void copyCategory(const LLInventoryCategory* other); // LLRefCount requires custom copy

+protected:

+    virtual ~LLInventoryCategory();

+

+    //--------------------------------------------------------------------

+    // Accessors And Mutators

+    //--------------------------------------------------------------------

+public:

+    LLFolderType::EType getPreferredType() const;

+    void setPreferredType(LLFolderType::EType type);

+    LLSD asLLSD() const;

+    LLSD asAISCreateCatLLSD() const;

+    bool fromLLSD(const LLSD& sd);

+

+    //--------------------------------------------------------------------

+    // Messaging

+    //--------------------------------------------------------------------

+public:

+    virtual void packMessage(LLMessageSystem* msg) const;

+    virtual void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);

+

+    //--------------------------------------------------------------------

+    // File Support

+    //--------------------------------------------------------------------

+public:

+    virtual bool importLegacyStream(std::istream& input_stream);

+    virtual bool exportLegacyStream(std::ostream& output_stream, bool include_asset_key = true) const;

+

+    LLSD exportLLSD() const;

+    bool importLLSD(const LLSD& cat_data);

+    //--------------------------------------------------------------------

+    // Member Variables

+    //--------------------------------------------------------------------

+protected:

+    LLFolderType::EType mPreferredType; // Type that this category was "meant" to hold (although it may hold any type).

+};

+

+

+//-----------------------------------------------------------------------------

+// Convertors

+//

+//   These functions convert between structured data and an inventory

+//   item, appropriate for serialization.

+//-----------------------------------------------------------------------------

+LLSD ll_create_sd_from_inventory_item(LLPointer<LLInventoryItem> item);

+LLSD ll_create_sd_from_inventory_category(LLPointer<LLInventoryCategory> cat);

+LLPointer<LLInventoryCategory> ll_create_category_from_sd(const LLSD& sd_cat);

+

+#endif // LL_LLINVENTORY_H