summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-04 10:27:46 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-04 10:27:46 -0400
commita77d273e3ab448d84507bfdb763df8335eadea9e (patch)
tree938e3b9b25ef1dd675d0acd2cf322f059b048d8b /indra/newview/llinventoryfunctions.cpp
parent882d8952dad1de21a3b2fca76e5f418b4c1b440f (diff)
parent15b855409a0ae7588236fe43f4aaa1d5d389b005 (diff)
automated merge
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r--indra/newview/llinventoryfunctions.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 817da34c61..ca6cede7e9 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -185,8 +185,6 @@ void remove_category(LLInventoryModel* model, const LLUUID& cat_id)
}
}
- // go ahead and do the normal remove if no 'last calling
- // cards' are being removed.
LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
if (cat)
{