diff options
| author | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-10 18:01:17 +0200 |
|---|---|---|
| committer | maximbproductengine <maximbproductengine@lindenlab.com> | 2013-01-10 18:01:17 +0200 |
| commit | f5a2929d8f8ba3adb3a78c2c28775a388caa7c44 (patch) | |
| tree | 6ef20400e3650bcffec93497ba72f4516805b931 /indra/newview/llviewerobject.cpp | |
| parent | bad4eda43677d26b88c86f4381c6a0f7436f0daf (diff) | |
| parent | def252341a8c1675405404a6588749d06fa40791 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 2fe6cd578b..52f73d6c43 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2869,23 +2869,6 @@ void LLViewerObject::updateInventory( U8 key, bool is_new) { - 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. |