New inventory categrory capability code - needs testing.

* Original code from: https://bitbucket.org/lindenlab/viewer-development/changeset/d327dcc8ae51
* Port by Henri Beauchamp: https://lists.secondlife.com/pipermail/opensource-dev/2012-January/008544.html
* 3 Lines of debug by /me (find the Hippos -remove after testing)

1 files changed, 12 insertions, 6 deletions

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index f71df2d..bd08773 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -1610,18 +1610,21 @@ void LLRightClickInventoryFetchDescendentsObserver::done()
 class LLInventoryCopyAndWearObserver : public LLInventoryObserver
 {
 public:
-        LLInventoryCopyAndWearObserver(const LLUUID& cat_id, int count) :mCatID(cat_id), mContentsCount(count), mFolderAdded(FALSE) {}
+        LLInventoryCopyAndWearObserver(const LLUUID& cat_id,
+                                                                   int count,
+                                                                   bool folder_added = false)
+        :       mCatID(cat_id),
+                mContentsCount(count),
+                mFolderAdded(FALSE) {}
         virtual ~LLInventoryCopyAndWearObserver() {}
         virtual void changed(U32 mask);
 
 protected:
         LLUUID mCatID;
         int    mContentsCount;
-        BOOL   mFolderAdded;
+        bool   mFolderAdded;
 };
 
-
-
 void LLInventoryCopyAndWearObserver::changed(U32 mask)
 {
         if((mask & (LLInventoryObserver::ADD)) != 0)
@@ -2331,13 +2334,16 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
 
         if(option == 0 && object)
         {
-                if (cat_and_wear && cat_and_wear->mWear)
+                if (cat_and_wear && cat_and_wear->mWear) // && !cat_and_wear->mFolderResponded)
                 {
                         InventoryObjectList inventory_objects;
                         object->getInventoryContents(inventory_objects);
                         int contents_count = inventory_objects.size()-1; //subtract one for containing folder
 
-                        LLInventoryCopyAndWearObserver* inventoryObserver = new LLInventoryCopyAndWearObserver(cat_and_wear->mCatID, contents_count);
+                        LLInventoryCopyAndWearObserver* inventoryObserver;
+                        inventoryObserver = new LLInventoryCopyAndWearObserver(cat_and_wear->mCatID,
+                                                                                                                                   contents_count,
+                                                                                                                                   cat_and_wear->mFolderResponded);
                         gInventory.addObserver(inventoryObserver);
                 }