summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-05-25 15:07:39 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-05-25 15:07:39 -0700
commita70d9363dadd23f5304013f87d47e5251d62c575 (patch)
tree774508d959bf46265f1d34dae2ab915c695c16bf /indra/newview/llinventorymodel.cpp
parentb26d3f37bef4e10be2b5f7f4f6408485ed3ccae7 (diff)
parent687b4907216339b5ff2b79a5a6c5dfdfb6deeba2 (diff)
Merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 098ee22280..d68b4c749d 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1245,9 +1245,11 @@ void LLInventoryModel::addCategory(LLViewerInventoryCategory* category)
void LLInventoryModel::addItem(LLViewerInventoryItem* item)
{
+ /*
const LLViewerInventoryCategory* cat = gInventory.getCategory(item->getParentUUID()); // Seraph remove for 2.1
const std::string cat_name = cat ? cat->getName() : "CAT NOT FOUND"; // Seraph remove for 2.1
llinfos << "Added item [ name:" << item->getName() << " UUID:" << item->getUUID() << " type:" << item->getActualType() << " ] to folder [ name:" << cat_name << " uuid:" << item->getParentUUID() << " ]" << llendl; // Seraph remove for 2.1
+ */
llassert(item);
if(item)