diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 16:44:49 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 16:44:49 -0800 |
| commit | ef26660c3087d848899023e8986db2aec752cf3f (patch) | |
| tree | ba4e6d0d926636d7c070cd1405cb7e98d0d4e541 /indra/newview/llviewerobject.cpp | |
| parent | 1cf636f7e712fb5ea1c71130ab1c7427eb9cad7a (diff) | |
| parent | 42c957e9d823ee5124fa1ac992fc0e803a3b0d9a (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -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 ecbedbfadb..bde4676eb4 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2866,21 +2866,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. |