diff options
Diffstat (limited to 'indra/newview/llinventorymodel.h')
| -rw-r--r-- | indra/newview/llinventorymodel.h | 661 |
1 files changed, 331 insertions, 330 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index f6728fd575..b7c1b57397 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -2,25 +2,31 @@ * @file llinventorymodel.h * @brief LLInventoryModel class header file * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. + * $LicenseInfo:firstyear=2002&license=viewergpl$ + * + * Copyright (c) 2002-2009, 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. + * Second Life Viewer Source Code + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 * - * 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. + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception * - * 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 + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ */ @@ -35,7 +41,6 @@ #include "lluuid.h" #include "llpermissionsflags.h" #include "llstring.h" -#include "llmd5.h" #include <map> #include <set> #include <string> @@ -53,15 +58,17 @@ class LLMessageSystem; class LLInventoryCollectFunctor; -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// LLInventoryModel +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// Class LLInventoryModel // -// Represents a collection of inventory, and provides efficient ways to access -// that information. -// NOTE: This class could in theory be used for any place where you need -// inventory, though it optimizes for time efficiency - not space efficiency, -// probably making it inappropriate for use on tasks. -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// This class represents a collection of inventory, and provides +// efficient ways to access that information. This class could in +// theory be used for any place where you need inventory, though it +// optimizes for time efficiency - not space efficiency, probably +// making it inappropriate for use on tasks. +//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + class LLInventoryModel { public: @@ -77,132 +84,79 @@ public: typedef LLDynamicArray<LLPointer<LLViewerInventoryCategory> > cat_array_t; typedef LLDynamicArray<LLPointer<LLViewerInventoryItem> > item_array_t; typedef std::set<LLUUID> changed_items_t; - + + // construction & destruction + LLInventoryModel(); + ~LLInventoryModel(); + + void cleanupInventory(); + class fetchInventoryResponder : public LLHTTPClient::Responder { public: fetchInventoryResponder(const LLSD& request_sd) : mRequestSD(request_sd) {}; void result(const LLSD& content); + void error(U32 status, const std::string& reason); + + public: + typedef std::vector<LLViewerInventoryCategory*> folder_ref_t; protected: LLSD mRequestSD; }; -/******************************************************************************** - ** ** - ** INITIALIZATION/SETUP - **/ - - //-------------------------------------------------------------------- - // Constructors / Destructors - //-------------------------------------------------------------------- -public: - LLInventoryModel(); - ~LLInventoryModel(); - void cleanupInventory(); -protected: - void empty(); // empty the entire contents - - //-------------------------------------------------------------------- - // Initialization - //-------------------------------------------------------------------- -public: - // The inventory model usage is sensitive to the initial construction of the model - bool isInventoryUsable() const; -private: - bool mIsAgentInvUsable; // used to handle an invalid inventory state + // + // Accessors + // - //-------------------------------------------------------------------- - // Root Folders - //-------------------------------------------------------------------- -public: - // The following are set during login with data from the server - void setRootFolderID(const LLUUID& id); - void setLibraryOwnerID(const LLUUID& id); - void setLibraryRootFolderID(const LLUUID& id); + // Check if one object has a parent chain up to the category specified by UUID. + BOOL isObjectDescendentOf(const LLUUID& obj_id, const LLUUID& cat_id) const; - const LLUUID &getRootFolderID() const; - const LLUUID &getLibraryOwnerID() const; - const LLUUID &getLibraryRootFolderID() const; -private: - LLUUID mRootFolderID; - LLUUID mLibraryRootFolderID; - LLUUID mLibraryOwnerID; - - //-------------------------------------------------------------------- - // Structure - //-------------------------------------------------------------------- -public: - // Methods to load up inventory skeleton & meat. These are used - // during authentication. Returns true if everything parsed. - bool loadSkeleton(const LLSD& options, const LLUUID& owner_id); - void buildParentChildMap(); // brute force method to rebuild the entire parent-child relations - // Call on logout to save a terse representation. - void cache(const LLUUID& parent_folder_id, const LLUUID& agent_id); -private: - // Information for tracking the actual inventory. We index this - // information in a lot of different ways so we can access - // the inventory using several different identifiers. - // mInventory member data is the 'master' list of inventory, and - // mCategoryMap and mItemMap store uuid->object mappings. - typedef std::map<LLUUID, LLPointer<LLViewerInventoryCategory> > cat_map_t; - typedef std::map<LLUUID, LLPointer<LLViewerInventoryItem> > item_map_t; - cat_map_t mCategoryMap; - item_map_t mItemMap; - // This last set of indices is used to map parents to children. - typedef std::map<LLUUID, cat_array_t*> parent_cat_map_t; - typedef std::map<LLUUID, item_array_t*> parent_item_map_t; - parent_cat_map_t mParentChildCategoryTree; - parent_item_map_t mParentChildItemTree; + // Get whatever special folder this object is a child of, if any. + const LLViewerInventoryCategory *getFirstNondefaultParent(const LLUUID& obj_id) const; - //-------------------------------------------------------------------- - // Login - //-------------------------------------------------------------------- -public: - static BOOL getIsFirstTimeInViewer2(); -private: - static BOOL sFirstTimeInViewer2; - const static S32 sCurrentInvCacheVersion; // expected inventory cache version + // Get the object by id. Returns NULL if not found. + // * WARNING: use the pointer returned for read operations - do + // not modify the object values in place or you will break stuff. + LLInventoryObject* getObject(const LLUUID& id) const; -/** Initialization/Setup - ** ** - *******************************************************************************/ + // Get the item by id. Returns NULL if not found. + // * WARNING: use the pointer for read operations - use the + // updateItem() method to actually modify values. + LLViewerInventoryItem* getItem(const LLUUID& id) const; -/******************************************************************************** - ** ** - ** ACCESSORS - **/ + // Get the category by id. Returns NULL if not found. + // * WARNING: use the pointer for read operations - use the + // updateCategory() method to actually modify values. + LLViewerInventoryCategory* getCategory(const LLUUID& id) const; - //-------------------------------------------------------------------- - // Descendents - //-------------------------------------------------------------------- -public: - // Make sure we have the descendents in the structure. Returns true - // if a fetch was performed. - bool fetchDescendentsOf(const LLUUID& folder_id) const; + // Return the number of items or categories + S32 getItemCount() const; + S32 getCategoryCount() const; // Return the direct descendents of the id provided.Set passed // in values to NULL if the call fails. - // NOTE: The array provided points straight into the guts of - // this object, and should only be used for read operations, since - // modifications may invalidate the internal state of the inventory. + // *WARNING: The array provided points straight into the guts of + // this object, and should only be used for read operations, since + // modifications may invalidate the internal state of the + // inventory. void getDirectDescendentsOf(const LLUUID& cat_id, cat_array_t*& categories, item_array_t*& items) const; - - // Compute a hash of direct descendent names (for detecting child name changes) - LLMD5 hashDirectDescendentNames(const LLUUID& cat_id) const; + + // SJB: Added version to lock the arrays to catch potential logic bugs + void lockDirectDescendentArrays(const LLUUID& cat_id, + cat_array_t*& categories, + item_array_t*& items); + void unlockDirectDescendentArrays(const LLUUID& cat_id); // Starting with the object specified, add its descendents to the // array provided, but do not add the inventory object specified - // by id. There is no guaranteed order. - // NOTE: Neither array will be erased before adding objects to it. - // Do not store a copy of the pointers collected - use them, and - // collect them again later if you need to reference the same objects. - enum { - EXCLUDE_TRASH = FALSE, - INCLUDE_TRASH = TRUE - }; + // by id. There is no guaranteed order. Neither array will be + // erased before adding objects to it. Do not store a copy of the + // pointers collected - use them, and collect them again later if + // you need to reference the same objects. + enum { EXCLUDE_TRASH = FALSE, INCLUDE_TRASH = TRUE }; void collectDescendents(const LLUUID& id, cat_array_t& categories, item_array_t& items, @@ -218,163 +172,156 @@ public: // Assumes item_id is itself not a linked item. item_array_t collectLinkedItems(const LLUUID& item_id, const LLUUID& start_folder_id = LLUUID::null); - - - // Check if one object has a parent chain up to the category specified by UUID. - BOOL isObjectDescendentOf(const LLUUID& obj_id, const LLUUID& cat_id) const; - - //-------------------------------------------------------------------- - // Find - //-------------------------------------------------------------------- -public: - // Returns the uuid of the category that specifies 'type' as what it - // defaults to containing. The category is not necessarily only for that type. - // NOTE: If create_folder is true, this will create a new inventory category - // on the fly if one does not exist. *NOTE: if find_in_library is true it - // will search in the user's library folder instead of "My Inventory" - const LLUUID findCategoryUUIDForType(LLFolderType::EType preferred_type, - bool create_folder = true, - bool find_in_library = false); - - // Get whatever special folder this object is a child of, if any. - const LLViewerInventoryCategory *getFirstNondefaultParent(const LLUUID& obj_id) const; - - // Get the object by id. Returns NULL if not found. - // NOTE: Use the pointer returned for read operations - do - // not modify the object values in place or you will break stuff. - LLInventoryObject* getObject(const LLUUID& id) const; - - // Get the item by id. Returns NULL if not found. - // NOTE: Use the pointer for read operations - use the - // updateItem() method to actually modify values. - LLViewerInventoryItem* getItem(const LLUUID& id) const; - - // Get the category by id. Returns NULL if not found. - // NOTE: Use the pointer for read operations - use the - // updateCategory() method to actually modify values. - LLViewerInventoryCategory* getCategory(const LLUUID& id) const; - // Get the inventoryID or item that this item points to, else just return object_id + // Get the inventoryID that this item points to, else just return item_id const LLUUID& getLinkedItemID(const LLUUID& object_id) const; - LLViewerInventoryItem* getLinkedItem(const LLUUID& object_id) const; -private: - mutable LLPointer<LLViewerInventoryItem> mLastItem; // cache recent lookups - - //-------------------------------------------------------------------- - // Count - //-------------------------------------------------------------------- -public: - // Return the number of items or categories - S32 getItemCount() const; - S32 getCategoryCount() const; -/** Accessors - ** ** - *******************************************************************************/ + // The inventory model usage is sensitive to the initial construction of the + // model. + bool isInventoryUsable() const; -/******************************************************************************** - ** ** - ** MUTATORS - **/ + // + // Mutators + // -public: - // Change an existing item with a matching item_id or add the item + // Calling this method with an inventory item will either change + // an existing item with a matching item_id, or will add the item // to the current inventory. Returns the change mask generated by // the update. No notification will be sent to observers. This // method will only generate network traffic if the item had to be // reparented. - // NOTE: In usage, you will want to perform cache accounting - // operations in LLInventoryModel::accountForUpdate() or - // LLViewerInventoryItem::updateServer() before calling this method. + // *NOTE: In usage, you will want to perform cache accounting + // operations in LLInventoryModel::accountForUpdate() or + // LLViewerInventoryItem::updateServer() before calling this + // method. U32 updateItem(const LLViewerInventoryItem* item); - // Change an existing item with the matching id or add + // Calling this method with an inventory category will either + // change an existing item with the matching id, or it will add // the category. No notifcation will be sent to observers. This // method will only generate network traffic if the item had to be // reparented. - // NOTE: In usage, you will want to perform cache accounting - // operations in accountForUpdate() or LLViewerInventoryCategory:: - // updateServer() before calling this method. + // *NOTE: In usage, you will want to perform cache accounting + // operations in LLInventoryModel::accountForUpdate() or + // LLViewerInventoryCategory::updateServer() before calling this + // method. void updateCategory(const LLViewerInventoryCategory* cat); - // Move the specified object id to the specified category and - // update the internal structures. No cache accounting, + // This method will move the specified object id to the specified + // category, update the internal structures. No cache accounting, // observer notification, or server update is performed. void moveObject(const LLUUID& object_id, const LLUUID& cat_id); - //-------------------------------------------------------------------- - // Delete - //-------------------------------------------------------------------- -public: - // Delete a particular inventory object by ID. Will purge one - // object from the internal data structures, maintaining a + // delete a particular inventory object by ID. This will purge one + // object from the internal data structures maintaining a // consistent internal state. No cache accounting, observer - // notification, or server update is performed. + // notification, or server update is performed. Purges linked items. void deleteObject(const LLUUID& id); - void removeItem(const LLUUID& item_id); - // Delete a particular inventory object by ID, and delete it from - // the server. Also updates linked items. + // delete a particular inventory object by ID, and delete it from + // the server. Also updates linked items. void purgeObject(const LLUUID& id); + void updateLinkedObjectsFromPurge(const LLUUID& baseobj_id); - // Collects and purges the descendants of the id + // This is a method which collects the descendants of the id // provided. If the category is not found, no action is // taken. This method goes through the long winded process of // removing server representation of folders and items while doing // cache accounting in a fairly efficient manner. This method does // not notify observers (though maybe it should...) void purgeDescendentsOf(const LLUUID& id); -protected: - void updateLinkedObjectsFromPurge(const LLUUID& baseobj_id); - - //-------------------------------------------------------------------- - // Reorder - //-------------------------------------------------------------------- -public: - // Changes items order by insertion of the item identified by src_item_id - // before the item identified by dest_item_id. Both items must exist in items array. - // Sorting is stored after method is finished. Only src_item_id is moved before dest_item_id. - static void updateItemsOrder(LLInventoryModel::item_array_t& items, - const LLUUID& src_item_id, - const LLUUID& dest_item_id); - - // Saves current order of the passed items using inventory item sort field. - // Resets 'items' sort fields and saves them on server. - // Is used to save order for Favorites folder. - void saveItemsOrder(const LLInventoryModel::item_array_t& items); - // Rearranges Landmarks inside Favorites folder. - // Moves source landmark before target one. - void rearrangeFavoriteLandmarks(const LLUUID& source_item_id, const LLUUID& target_item_id); + // This method optimally removes the referenced categories and + // items from the current agent's inventory in the database. It + // performs all of the during deletion. The local representation + // is not removed. + void deleteFromServer(LLDynamicArray<LLUUID>& category_ids, + LLDynamicArray<LLUUID>& item_ids); - //-------------------------------------------------------------------- - // Creation - //-------------------------------------------------------------------- -public: - // Returns the UUID of the new category. If you want to use the default - // name based on type, pass in a NULL to the 'name' parameter. + // Add/remove an observer. If the observer is destroyed, be sure + // to remove it. + void addObserver(LLInventoryObserver* observer); + void removeObserver(LLInventoryObserver* observer); + BOOL containsObserver(LLInventoryObserver* observer) const; + + // + // Misc Methods + // + + // findCategoryUUIDForType() returns the uuid of the category that + // specifies 'type' as what it defaults to containing. The + // category is not necessarily only for that type. *NOTE: If create_folder is true, this + // will create a new inventory category on the fly if one does not exist. *NOTE: if find_in_library is + // true it will search in the user's library folder instead of "My Inventory" + // SDK: Added flag to specify whether the folder should be created if not found. This fixes the horrible + // multiple trash can bug. + const LLUUID findCategoryUUIDForType(LLFolderType::EType preferred_type, bool create_folder = true, bool find_in_library = false); + + // This gets called by the idle loop. It only updates if new + // state is detected. Call notifyObservers() manually to update + // regardless of whether state change has been indicated. + void idleNotifyObservers(); + + // Call this method to explicitly update everyone on a new state. + // The optional argument 'service_name' is used by Agent Inventory Service [DEV-20328] + void notifyObservers(const std::string service_name=""); + + // This allows outsiders to tell the inventory if something has + // been changed 'under the hood', but outside the control of the + // inventory. For example, if we grant someone modify permissions, + // then that changes the data structures for LLAvatarTracker, but + // potentially affects inventory observers. This API makes sure + // that the next notify will include that notification. + void addChangedMask(U32 mask, const LLUUID& referent); + + const changed_items_t& getChangedIDs() const { return mChangedItemIDs; } + + // This method to prepares a set of mock inventory which provides + // minimal functionality before the actual arrival of inventory. + //void mock(const LLUUID& root_id); + + // Make sure we have the descendents in the structure. Returns true + // if a fetch was performed. + bool fetchDescendentsOf(const LLUUID& folder_id); + + // call this method to request the inventory. + //void requestFromServer(const LLUUID& agent_id); + + // call this method on logout to save a terse representation + void cache(const LLUUID& parent_folder_id, const LLUUID& agent_id); + + // Generates a string containing the path to the item specified by + // item_id. + void appendPath(const LLUUID& id, std::string& path) const; + + // message handling functionality + static void registerCallbacks(LLMessageSystem* msg); + + // Convenience function to create a new category. You could call + // updateCatgory() with a newly generated UUID category, but this + // version will take care of details like what the name should be + // based on preferred type. Returns the UUID of the new + // category. If you want to use the default name based on type, + // pass in a NULL to the 'name parameter. LLUUID createNewCategory(const LLUUID& parent_id, LLFolderType::EType preferred_type, const std::string& name); -protected: - // Internal methods that add inventory and make sure that all of - // the internal data structures are consistent. These methods - // should be passed pointers of newly created objects, and the - // instance will take over the memory management from there. - void addCategory(LLViewerInventoryCategory* category); - void addItem(LLViewerInventoryItem* item); - -/** Mutators - ** ** - *******************************************************************************/ -/******************************************************************************** - ** ** - ** CATEGORY ACCOUNTING - **/ + // methods to load up inventory skeleton & meat. These are used + // during authentication. return true if everything parsed. + bool loadSkeleton(const LLSD& options, const LLUUID& owner_id); + bool loadMeat(const LLSD& options, const LLUUID& owner_id); + + // This is a brute force method to rebuild the entire parent-child + // relations. + void buildParentChildMap(); -public: - // Represents the number of items added or removed from a category. + // + // Category accounting. + // + + // This structure represents the number of items added or removed + // from a category. struct LLCategoryUpdate { LLCategoryUpdate() : mDescendentDelta(0) {} @@ -386,7 +333,8 @@ public: }; typedef std::vector<LLCategoryUpdate> update_list_t; - // This exists to make it easier to account for deltas in a map. + // This structure eixts to make it easier to account for deltas in + // a map. struct LLInitializedS32 { LLInitializedS32() : mValue(0) {} @@ -397,89 +345,102 @@ public: }; typedef std::map<LLUUID, LLInitializedS32> update_map_t; - // Call when there are category updates. Call them *before* the - // actual update so the method can do descendent accounting correctly. + // Call these methods when there are category updates, but call + // them *before* the actual update so the method can do descendent + // accounting correctly. void accountForUpdate(const LLCategoryUpdate& update) const; void accountForUpdate(const update_list_t& updates); void accountForUpdate(const update_map_t& updates); - // Return (yes/no/maybe) child status of category children. + // Return child status of category children. yes/no/maybe EHasChildren categoryHasChildren(const LLUUID& cat_id) const; - // Returns true iff category version is known and theoretical + // returns true iff category version is known and theoretical // descendents == actual descendents. bool isCategoryComplete(const LLUUID& cat_id) const; -/** Category Accounting - ** ** - *******************************************************************************/ + // callbacks + // Trigger a notification and empty the folder type (FT_TRASH or FT_LOST_AND_FOUND) if confirmed + void emptyFolderType(const std::string notification, LLFolderType::EType folder_type); + bool callbackEmptyFolderType(const LLSD& notification, const LLSD& response, LLFolderType::EType preferred_type); -/******************************************************************************** - ** ** - ** NOTIFICATIONS - **/ + // Utility Functions + void removeItem(const LLUUID& item_id); + + // Data about the agent's root folder and root library folder + // are stored here, rather than in LLAgent where it used to be, because + // gInventory is a singleton and represents the agent's inventory. + // The "library" is actually the inventory of a special agent, + // usually Alexandria Linden. + const LLUUID &getRootFolderID() const; + const LLUUID &getLibraryOwnerID() const; + const LLUUID &getLibraryRootFolderID() const; -public: - // Called by the idle loop. Only updates if new state is detected. Call - // notifyObservers() manually to update regardless of whether state change - // has been indicated. - void idleNotifyObservers(); + // These are set during login with data from the server + void setRootFolderID(const LLUUID& id); + void setLibraryOwnerID(const LLUUID& id); + void setLibraryRootFolderID(const LLUUID& id); - // Call to explicitly update everyone on a new state. The optional argument - // 'service_name' is used by Agent Inventory Service [DEV-20328] - void notifyObservers(const std::string service_name=""); - // Allows outsiders to tell the inventory if something has - // been changed 'under the hood', but outside the control of the - // inventory. The next notify will include that notification. - void addChangedMask(U32 mask, const LLUUID& referent); - const changed_items_t& getChangedIDs() const { return mChangedItemIDs; } + /** + * Changes items order by insertion of the item identified by src_item_id + * BEFORE the item identified by dest_item_id. Both items must exist in items array. + * + * Sorting is stored after method is finished. Only src_item_id is moved before dest_item_id. + * + * @param[in, out] items - vector with items to be updated. It should be sorted in a right way + * before calling this method. + * @param src_item_id - LLUUID of inventory item to be moved in new position + * @param dest_item_id - LLUUID of inventory item before which source item should be placed. + */ + static void updateItemsOrder(LLInventoryModel::item_array_t& items, const LLUUID& src_item_id, const LLUUID& dest_item_id); + + /** + * Saves current order of the passed items using inventory item sort field. + * + * It reset items' sort fields and saves them on server. + * Is used to save order for Favorites folder. + * + * @param[in] items vector of items in order to be saved. + */ + void saveItemsOrder(const LLInventoryModel::item_array_t& items); + + /** + * Rearranges Landmarks inside Favorites folder. + * Moves source landmark before target one. + * + * @param source_item_id - LLUUID of the source item to be moved into new position + * @param target_item_id - LLUUID of the target item before which source item should be placed. + */ + void rearrangeFavoriteLandmarks(const LLUUID& source_item_id, const LLUUID& target_item_id); + protected: - // Updates all linked items pointing to this id. - void addChangedMaskForLinks(const LLUUID& object_id, U32 mask); -private: - // Flag set when notifyObservers is being called, to look for bugs - // where it's called recursively. - BOOL mIsNotifyObservers; - // Variables used to track what has changed since the last notify. - U32 mModifyMask; - changed_items_t mChangedItemIDs; - - //-------------------------------------------------------------------- - // Observers - //-------------------------------------------------------------------- -public: - // If the observer is destroyed, be sure to remove it. - void addObserver(LLInventoryObserver* observer); - void removeObserver(LLInventoryObserver* observer); - BOOL containsObserver(LLInventoryObserver* observer) const; -private: - typedef std::set<LLInventoryObserver*> observer_list_t; - observer_list_t mObservers; - -/** Notifications - ** ** - *******************************************************************************/ + // Internal methods which add inventory and make sure that all of + // the internal data structures are consistent. These methods + // should be passed pointers of newly created objects, and the + // instance will take over the memory management from there. + void addCategory(LLViewerInventoryCategory* category); + void addItem(LLViewerInventoryItem* item); -/******************************************************************************** - ** ** - ** MISCELLANEOUS - **/ + // ! DEPRECRATE ! Remove this and add it into findCategoryUUIDForType, + // since that's the only function that uses this. It's too confusing + // having both methods. + // + // Internal method which looks for a category with the specified + // preferred type. Returns LLUUID::null if not found + const LLUUID &findCatUUID(LLFolderType::EType preferred_type, bool find_in_library = false) const; - //-------------------------------------------------------------------- - // Callbacks - //-------------------------------------------------------------------- -public: - // Trigger a notification and empty the folder type (FT_TRASH or FT_LOST_AND_FOUND) if confirmed - void emptyFolderType(const std::string notification, LLFolderType::EType folder_type); - bool callbackEmptyFolderType(const LLSD& notification, const LLSD& response, LLFolderType::EType preferred_type); - static void registerCallbacks(LLMessageSystem* msg); + // Empty the entire contents + void empty(); - //-------------------------------------------------------------------- - // File I/O - //-------------------------------------------------------------------- -protected: + // Given the current state of the inventory items, figure out the + // clone information. *FIX: This is sub-optimal, since we can + // insert this information snurgically, but this makes sure the + // implementation works before we worry about optimization. + //void recalculateCloneInformation(); + + // file import/export. static bool loadFromFile(const std::string& filename, cat_array_t& categories, item_array_t& items, @@ -488,46 +449,86 @@ protected: const cat_array_t& categories, const item_array_t& items); - //-------------------------------------------------------------------- - // Message handling functionality - //-------------------------------------------------------------------- -public: + // message handling functionality + //static void processUseCachedInventory(LLMessageSystem* msg, void**); static void processUpdateCreateInventoryItem(LLMessageSystem* msg, void**); static void processRemoveInventoryItem(LLMessageSystem* msg, void**); static void processUpdateInventoryFolder(LLMessageSystem* msg, void**); static void processRemoveInventoryFolder(LLMessageSystem* msg, void**); + //static void processExchangeCallingcard(LLMessageSystem* msg, void**); + //static void processAddCallingcard(LLMessageSystem* msg, void**); + //static void processDeclineCallingcard(LLMessageSystem* msg, void**); static void processSaveAssetIntoInventory(LLMessageSystem* msg, void**); static void processBulkUpdateInventory(LLMessageSystem* msg, void**); static void processInventoryDescendents(LLMessageSystem* msg, void**); static void processMoveInventoryItem(LLMessageSystem* msg, void**); static void processFetchInventoryReply(LLMessageSystem* msg, void**); -protected: + bool messageUpdateCore(LLMessageSystem* msg, bool do_accounting); - //-------------------------------------------------------------------- - // Locks - //-------------------------------------------------------------------- -public: - void lockDirectDescendentArrays(const LLUUID& cat_id, - cat_array_t*& categories, - item_array_t*& items); - void unlockDirectDescendentArrays(const LLUUID& cat_id); + // Updates all linked items pointing to this id. + void addChangedMaskForLinks(const LLUUID& object_id, U32 mask); + protected: cat_array_t* getUnlockedCatArray(const LLUUID& id); item_array_t* getUnlockedItemArray(const LLUUID& id); + private: + // Variables used to track what has changed since the last notify. + U32 mModifyMask; + changed_items_t mChangedItemIDs; + std::map<LLUUID, bool> mCategoryLock; std::map<LLUUID, bool> mItemLock; - //-------------------------------------------------------------------- - // Debugging - //-------------------------------------------------------------------- + // cache recent lookups + mutable LLPointer<LLViewerInventoryItem> mLastItem; + + // This last set of indices is used to map parents to children. + typedef std::map<LLUUID, cat_array_t*> parent_cat_map_t; + typedef std::map<LLUUID, item_array_t*> parent_item_map_t; + parent_cat_map_t mParentChildCategoryTree; + parent_item_map_t mParentChildItemTree; + + typedef std::set<LLInventoryObserver*> observer_list_t; + observer_list_t mObservers; + + // Agent inventory folder information. + LLUUID mRootFolderID; + LLUUID mLibraryRootFolderID; + LLUUID mLibraryOwnerID; + + // Expected inventory cache version + const static S32 sCurrentInvCacheVersion; + + // This flag is used to handle an invalid inventory state. + bool mIsAgentInvUsable; + +private: + // Information for tracking the actual inventory. We index this + // information in a lot of different ways so we can access + // the inventory using several different identifiers. + // mInventory member data is the 'master' list of inventory, and + // mCategoryMap and mItemMap store uuid->object mappings. + typedef std::map<LLUUID, LLPointer<LLViewerInventoryCategory> > cat_map_t; + typedef std::map<LLUUID, LLPointer<LLViewerInventoryItem> > item_map_t; + //inv_map_t mInventory; + cat_map_t mCategoryMap; + item_map_t mItemMap; + + // Flag set when notifyObservers is being called, to look for bugs + // where it's called recursively. + BOOL mIsNotifyObservers; public: + // *NOTE: DEBUG functionality void dumpInventory() const; -/** Miscellaneous - ** ** - *******************************************************************************/ + //////////////////////////////////////////////////////////////////////////////// + // Login status +public: + static BOOL getIsFirstTimeInViewer2(); +private: + static BOOL sFirstTimeInViewer2; }; // a special inventory model for the agent |