aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-05-07 18:27:37 -0700
committerMcCabe Maxsted2011-06-08 22:05:55 -0700
commit8225622fd40a14afdb041f6231811d4b00cf357d (patch)
treedb21e603965c89cf7229b8e7903580cb8275d1eb /linden
parentAlways show an item count in the inventory (diff)
downloadmeta-impy-8225622fd40a14afdb041f6231811d4b00cf357d.zip
meta-impy-8225622fd40a14afdb041f6231811d4b00cf357d.tar.gz
meta-impy-8225622fd40a14afdb041f6231811d4b00cf357d.tar.bz2
meta-impy-8225622fd40a14afdb041f6231811d4b00cf357d.tar.xz
Committing some more useful debugging lines
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llinventorymodel.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 75c5162..58a2bdc 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -2688,14 +2688,14 @@ bool LLInventoryModel::loadFromFile(const std::string& filename,
2688 // *FIX: Need a better solution, this prevents the 2688 // *FIX: Need a better solution, this prevents the
2689 // application from freezing, but breaks inventory 2689 // application from freezing, but breaks inventory
2690 // caching. 2690 // caching.
2691 if(inv_item->getUUID().isNull()) 2691 //if(inv_item->getUUID().isNull())MCCABE
2692 { 2692 //{
2693 //delete inv_item; // automatic when inv_cat is reassigned or destroyed 2693 // //delete inv_item; // automatic when inv_cat is reassigned or destroyed
2694 llwarns << "Ignoring inventory with null item id: " 2694 // llwarns << "Ignoring inventory with null item id: "
2695 << inv_item->getName() << llendl; 2695 // << inv_item->getName() << llendl;
2696 2696 //
2697 } 2697 //}
2698 else 2698 //else
2699 { 2699 {
2700 items.put(inv_item); 2700 items.put(inv_item);
2701 item_count_total++; 2701 item_count_total++;