1 files changed, 25 insertions, 12 deletions

diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index b03be24..8017410 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -162,7 +162,13 @@ public:
         void getDirectDescendentsOf(const LLUUID& cat_id,
                                                                 cat_array_t*& categories,
                                                                 item_array_t*& items) 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 it's descendents to the
         // array provided, but do not add the inventory object specified
         // by id. There is no guaranteed order. Neither array will be
@@ -292,7 +298,7 @@ public:
 
         // Generates a string containing the path to the item specified by
         // item_id.
-        void appendPath(const LLUUID& id, LLString& path);
+        void appendPath(const LLUUID& id, std::string& path);
 
         // message handling functionality
         static void registerCallbacks(LLMessageSystem* msg);
@@ -305,7 +311,7 @@ public:
         // pass in a NULL to the 'name parameter.
         LLUUID createNewCategory(const LLUUID& parent_id,
                                                          LLAssetType::EType preferred_type,
-                                                         const LLString& name);
+                                                         const std::string& name);
 
         // methods to load up inventory skeleton & meat. These are used
         // during authentication. return true if everything parsed.
@@ -392,14 +398,12 @@ protected:
         //void recalculateCloneInformation();
 
         // file import/export.
-        static bool loadFromFile(
-                const char* filename,
-                cat_array_t& categories,
-                item_array_t& items); 
-        static bool saveToFile(
-                const char* filename,
-                const cat_array_t& categories,
-                const item_array_t& items); 
+        static bool loadFromFile(const std::string& filename,
+                                                         cat_array_t& categories,
+                                                         item_array_t& items); 
+        static bool saveToFile(const std::string& filename,
+                                                   const cat_array_t& categories,
+                                                   const item_array_t& items); 
 
         // message handling functionality
         //static void processUseCachedInventory(LLMessageSystem* msg, void**);
@@ -420,6 +424,10 @@ protected:
         bool messageUpdateCore(LLMessageSystem* msg, bool do_accounting);
 
 protected:
+        cat_array_t* getUnlockedCatArray(const LLUUID& id);
+        item_array_t* getUnlockedItemArray(const LLUUID& id);
+        
+protected:
         // Varaibles used to track what has changed since the last notify.
         U32 mModifyMask;
         typedef std::set<LLUUID> changed_items_t;
@@ -436,6 +444,9 @@ protected:
         cat_map_t mCategoryMap;
         item_map_t mItemMap;
 
+        std::map<LLUUID, bool> mCategoryLock;
+        std::map<LLUUID, bool> mItemLock;
+        
         // cache recent lookups
         mutable LLPointer<LLViewerInventoryItem> mLastItem;
 
@@ -486,6 +497,8 @@ class LLInventoryCollectFunctor
 public:
         virtual ~LLInventoryCollectFunctor(){};
         virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) = 0;
+
+        static bool itemTransferCommonlyAllowed(LLInventoryItem* item);
 };
 
 
@@ -645,7 +658,7 @@ protected:
 class LLNameCategoryCollector : public LLInventoryCollectFunctor
 {
 public:
-        LLNameCategoryCollector(const char* name) : mName(name) {}
+        LLNameCategoryCollector(const std::string& name) : mName(name) {}
         virtual ~LLNameCategoryCollector() {}
         virtual bool operator()(LLInventoryCategory* cat,
                                                         LLInventoryItem* item);