diff options
| author | MaksymS ProductEngine <msavchenko@productengine.com> | 2012-09-04 12:37:51 +0300 |
|---|---|---|
| committer | MaksymS ProductEngine <msavchenko@productengine.com> | 2012-09-04 12:37:51 +0300 |
| commit | 608fa855b3e8d647d22e586218a4fc12277c387e (patch) | |
| tree | 412ca95b588f429188646ac1da03b258b135b427 /indra/newview/llviewerobject.cpp | |
| parent | c1c80133a29b97112c887a75252fafe7a70d9a78 (diff) | |
MAINT-1502 User is unable to rename script inside content of object:
- regression after wrong merge, full fix was done in MAINT-1228;
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 17091a91d6..35ae68fd8c 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2836,21 +2836,6 @@ void LLViewerObject::updateInventory( U8 key, bool is_new) { - 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. |