From 45336ca20da639b53fcd9d0fa2200c03a347bc55 Mon Sep 17 00:00:00 2001 From: William Todd Stinson Date: Thu, 8 Nov 2012 17:37:01 -0800 Subject: MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to fix these issues, but then was accidentally re-introduced during a bad merge. --- indra/newview/llviewerobject.cpp | 15 --------------- 1 file changed, 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::iterator begin = mPendingInventoryItemsIDs.begin(); - std::list::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. -- cgit v1.2.3 From a1270b0ba278b297bb862b714c325578991c0dcf Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 9 Nov 2012 09:25:56 -0500 Subject: tag merge of DRTVWR-242 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d65e1ce9fa..311b6924e2 100755 --- a/.hgtags +++ b/.hgtags @@ -348,3 +348,4 @@ b61afe175b829c149d369524a4e974dfda99facf DRTVWR-219 704bbae7b182a1f2811a47a054e680522966f54a 3.4.2-beta1 288539fc0408ed4b69a99665de33bbbc2c3c08fe DRTVWR-216 e664473c16df1d82ffaff382e7b3e023da202d52 3.4.2-beta2 +0891d7a773a31397dcad48be3fa66531d567a821 DRTVWR-242 -- cgit v1.2.3 From 8a3384adafff1b34d5a903e4d8cfd2dabca9e243 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 9 Nov 2012 16:16:03 -0500 Subject: Added tag 3.4.2-beta3 for changeset 710785535362 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 311b6924e2..2389922e53 100755 --- a/.hgtags +++ b/.hgtags @@ -349,3 +349,4 @@ b61afe175b829c149d369524a4e974dfda99facf DRTVWR-219 288539fc0408ed4b69a99665de33bbbc2c3c08fe DRTVWR-216 e664473c16df1d82ffaff382e7b3e023da202d52 3.4.2-beta2 0891d7a773a31397dcad48be3fa66531d567a821 DRTVWR-242 +710785535362b3cb801b6a3dc4703be3373bd0cd 3.4.2-beta3 -- cgit v1.2.3