1 files changed, 4 insertions, 17 deletions

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index d9ee3f8bf4..c9e9d50e19 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -78,7 +78,7 @@
 
 // Increment this if the inventory contents change in a non-backwards-compatible way.
 // For viewer 2, the addition of link items makes a pre-viewer-2 cache incorrect.
-const S32 LLInventoryModel::sCurrentInvCacheVersion = 4;
+const S32 LLInventoryModel::sCurrentInvCacheVersion = 3;
 bool LLInventoryModel::sFirstTimeInViewer2 = true;
 
 S32 LLInventoryModel::sPendingSystemFolders = 0;
@@ -1283,10 +1283,6 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
     {
         for (auto& cat : *cat_array)
         {
-            if (add.exceedsLimit())
-            {
-                break;
-            }
             if(add(cat,NULL))
             {
                 cats.push_back(cat);
@@ -1302,10 +1298,6 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
     {
         for (auto& item : *item_array)
         {
-            if (add.exceedsLimit())
-            {
-                break;
-            }
             if(add(NULL, item))
             {
                 items.push_back(item);
@@ -2816,9 +2808,8 @@ bool LLInventoryModel::loadSkeleton(
                     cached_ids.insert(tcat->getUUID());
 
                     // At the moment download does not provide a thumbnail
-                    // uuid or favorite, use values from cache
+                    // uuid, use the one from cache
                     tcat->setThumbnailUUID(cat->getThumbnailUUID());
-                    tcat->setFavorite(cat->getIsFavorite());
                 }
             }
 
@@ -3510,9 +3501,7 @@ bool LLInventoryModel::saveToFile(const std::string& filename,
         {
             if (cat->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN)
             {
-                LLSD sd = LLSD::emptyMap();
-                cat->exportLLSD(sd);
-                fileXML << LLSDOStreamer<LLSDNotationFormatter>(sd) << std::endl;
+                fileXML << LLSDOStreamer<LLSDNotationFormatter>(cat->exportLLSD()) << std::endl;
                 cat_count++;
             }
 
@@ -3526,9 +3515,7 @@ bool LLInventoryModel::saveToFile(const std::string& filename,
         auto it_count = items.size();
         for (auto& item : items)
         {
-            LLSD sd = LLSD::emptyMap();
-            item->asLLSD(sd);
-            fileXML << LLSDOStreamer<LLSDNotationFormatter>(sd) << std::endl;
+            fileXML << LLSDOStreamer<LLSDNotationFormatter>(item->asLLSD()) << std::endl;
 
             if (fileXML.fail())
             {