diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-09 16:47:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-09 16:47:14 -0500 |
| commit | 42c957e9d823ee5124fa1ac992fc0e803a3b0d9a (patch) | |
| tree | 4342709a9711373bbb7bab4aa30885969db40d0e /indra | |
| parent | b76b81ff811014012856f58970c1aac093507557 (diff) | |
| parent | 8a3384adafff1b34d5a903e4d8cfd2dabca9e243 (diff) | |
pull back 3.4.2-beta3 fixes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 2fe6cd578b..f9342a9736 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2871,21 +2871,6 @@ void LLViewerObject::updateInventory( { LLMemType mt(LLMemType::MTYPE_OBJECT); - std::list<LLUUID>::iterator begin = mPendingInventoryItemsIDs.begin(); - std::list<LLUUID>::iterator end = mPendingInventoryItemsIDs.end(); - - bool is_fetching = std::find(begin, end, item->getAssetUUID()) != end; - bool is_fetched = getInventoryItemByAsset(item->getAssetUUID()) != NULL; - - if (is_fetched || is_fetching) - { - return; - } - else - { - mPendingInventoryItemsIDs.push_back(item->getAssetUUID()); - } - // This slices the object into what we're concerned about on the // viewer. The simulator will take the permissions and transfer // ownership. |