diff options
author | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:31 -0700 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:31 -0700 |
commit | 121c4034db2de1b73bdab6777f49f302d89af3ca (patch) | |
tree | 0e0cf941c3838a899d4a31433773e974eb9b4fd4 /indra/newview/llinventorymodel.cpp | |
parent | 7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c (diff) | |
parent | 961d5b1d65fffff7075d0afbce003586b1f3b197 (diff) |
Merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r-- | indra/newview/llinventorymodel.cpp | 2 |
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) |