diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-09 12:45:34 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-09 12:45:34 -0800 |
| commit | 9d70bc259a02a0f6dcc6cff1c95a34353e0f1e59 (patch) | |
| tree | ccfb4600d5735f65a567383feda7112adaf31f9b /indra/newview | |
| parent | c296a7eadab5a5d0e4406b0e4c1aa6d532bad9f2 (diff) | |
CHUI-652 : Fixed : Skip the bogus fetching test when adding objects to object content.
Diffstat (limited to 'indra/newview')
| -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. |