diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-21 15:02:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-21 15:02:03 -0400 |
| commit | c118ec209907618c77613990fe2359d4f92802e6 (patch) | |
| tree | b2fa95d1fa1563cdee89d2bf035b680c64918c0f /indra/newview/llinventorymodel.cpp | |
| parent | 54bb91fd03d0c2f2600993274c59ae89324eeb03 (diff) | |
| parent | 67e365ba57bb7024a64bc0663782cd7f06b4a5cc (diff) | |
merge up changes for 2.8.0 release
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) |