summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-11 11:24:05 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-11 11:24:05 -0400
commit48222564def4534b157f91e36a10c4df79010bfc (patch)
tree65cc1c5ad92a7805b11366e17bb7bb0d11d915e0 /indra/newview/llinventorymodel.cpp
parent55f11fdfd17bdd3d9d0944940c62507741ac6a7b (diff)
parent97ba99b3c04904633ec3e52f69602a11343e8b4c (diff)
merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 318beafe65..21d5de9a5b 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -2589,7 +2589,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
LLInventoryState::sWearNewClothing = FALSE;
}
- if (tid == LLInventoryState::sWearNewClothingTransactionID)
+ if (tid.notNull() && tid == LLInventoryState::sWearNewClothingTransactionID)
{
count = wearable_ids.size();
for (i = 0; i < count; ++i)