Second Life viewer sources 1.18.4.0-RC

1 files changed, 58 insertions, 10 deletions

diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 9df8fa4..aa90538 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -2,6 +2,8 @@
  * @file llinventorymodel.cpp
  * @brief Implementation of the inventory model used to track agent inventory.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -172,7 +175,8 @@ LLInventoryModel gInventory;
 // Default constructor
 LLInventoryModel::LLInventoryModel() :
         mModifyMask(LLInventoryObserver::ALL),
-        mLastItem(NULL)
+        mLastItem(NULL),
+        mIsAgentInvUsable(false)
 {
 }
 
@@ -289,13 +293,9 @@ void LLInventoryModel::getDirectDescendentsOf(const LLUUID& cat_id,
 LLUUID LLInventoryModel::findCategoryUUIDForType(LLAssetType::EType t)
 {
         LLUUID rv = findCatUUID(t);
-        if(rv.isNull())
+        if(rv.isNull() && isInventoryUsable())
         {
-                rv = gAgent.getInventoryRootID();
-                if(rv.notNull())
-                {
-                        rv = createNewCategory(rv, t, NULL);
-                }
+                rv = createNewCategory(rv, t, NULL);
         }
         return rv;
 }
@@ -329,7 +329,7 @@ LLUUID LLInventoryModel::findCatUUID(LLAssetType::EType preferred_type)
 }
 
 // Convenience function to create a new category. You could call
-// updateCatgory() with a newly generated UUID category, but this
+// updateCategory() 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.
 LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
@@ -337,6 +337,12 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                                                                                    const LLString& pname)
 {
         LLUUID id;
+        if(!isInventoryUsable())
+        {
+                llwarns << "Inventory is broken." << llendl;
+                return id;
+        }
+
         id.generate();
         LLString name = pname;
         if(!pname.empty())
@@ -470,6 +476,16 @@ void LLInventoryModel::appendPath(const LLUUID& id, LLString& path)
         path.append(temp);
 }
 
+bool LLInventoryModel::isInventoryUsable()
+{
+        bool result = false;
+        if(gAgent.getInventoryRootID().notNull() && mIsAgentInvUsable)
+        {
+                result = true;
+        }
+        return result;  
+}
+
 // 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.
@@ -480,6 +496,13 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item)
         {
                 return mask;
         }
+
+        if(!isInventoryUsable())
+        {
+                llwarns << "Inventory is broken." << llendl;
+                return mask;
+        }
+
         LLViewerInventoryItem* old_item = getItem(item->getUUID());
         if(old_item)
         {
@@ -588,6 +611,13 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat)
         {
                 return;
         }
+
+        if(!isInventoryUsable())
+        {
+                llwarns << "Inventory is broken." << llendl;
+                return;
+        }
+
         LLViewerInventoryCategory* old_cat = getCategory(cat->getUUID());
         if(old_cat)
         {
@@ -645,6 +675,12 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat)
 void LLInventoryModel::moveObject(const LLUUID& object_id, const LLUUID& cat_id)
 {
         lldebugs << "LLInventoryModel::moveObject()" << llendl;
+        if(!isInventoryUsable())
+        {
+                llwarns << "Inventory is broken." << llendl;
+                return;
+        }
+
         if((object_id == cat_id) || !is_in_map(mCategoryMap, cat_id))
         {
                 llwarns << "Could not move inventory object " << object_id << " to "
@@ -1086,7 +1122,7 @@ void LLInventoryModel::backgroundFetch(void*)
                         {
                                 // finished with this category, remove from queue
                                 sFetchQueue.pop_front();
-                                
+
                                 // add all children to queue
                                 parent_cat_map_t::iterator cat_it = gInventory.mParentChildCategoryTree.find(cat->getUUID());
                                 if (cat_it != gInventory.mParentChildCategoryTree.end())
@@ -1863,6 +1899,19 @@ void LLInventoryModel::buildParentChildMap()
                         gAgent.sendReliableMessage();
                 }
         }
+
+        const LLUUID& agent_inv_root_id = gAgent.getInventoryRootID();
+        if (agent_inv_root_id.notNull())
+        {
+                cat_array_t* catsp = get_ptr_in_map(mParentChildCategoryTree, agent_inv_root_id);
+                if(catsp)
+                {
+                        // 'My Inventory',
+                        // root of the agent's inv found.
+                        // The inv tree is built.
+                        mIsAgentInvUsable = true;
+                }
+        }
 }
 
 struct LLUUIDAndName
@@ -2695,7 +2744,6 @@ void LLInventoryModel::dumpInventory()
         llinfos << "\n**********************\nEnd Inventory Dump" << llendl;
 }
 
-
 ///----------------------------------------------------------------------------
 /// LLInventoryCollectFunctor implementations
 ///----------------------------------------------------------------------------