From be07694b9cc8d2203cfedc777bcb00021dfa91a1 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 22 Aug 2013 00:51:15 +0200 Subject: MAINT-2773: Disable texture animation doesn't work --- indra/newview/llviewerobjectlist.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/newview/llviewerobjectlist.cpp') diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 66615657d8..b4e287c446 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -954,15 +954,17 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) objectp = *idle_iter; llassert(objectp->isActive()); objectp->idleUpdate(agent, world, frame_time); - - } + } //update flexible objects LLVolumeImplFlexible::updateClass(); //update animated textures - LLViewerTextureAnim::updateClass(); - } + if (gAnimateTextures) + { + LLViewerTextureAnim::updateClass(); + } + } -- cgit v1.2.3 From 79836e32d575248642cfd6af837548aac054988f Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Mon, 9 Sep 2013 13:26:13 -0700 Subject: MAINT-140 revert to simplified cleanDeadObjects to avoid accidental refcounting crashes --- indra/newview/llviewerobjectlist.cpp | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) (limited to 'indra/newview/llviewerobjectlist.cpp') diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 66615657d8..8a013a6d91 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1324,45 +1324,27 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer) return; } + LLViewerObject *objectp = NULL; S32 num_removed = 0; - LLViewerObject *objectp; - - vobj_list_t::reverse_iterator target = mObjects.rbegin(); - vobj_list_t::iterator iter = mObjects.begin(); - for ( ; iter != mObjects.end(); ) + vobj_list_t::iterator iter; + for (iter = mObjects.begin(); iter != mObjects.end();) { // Scan for all of the dead objects and put them all on the end of the list with no ref count ops objectp = *iter; - if (objectp == NULL) - { //we caught up to the dead tail - break; - } - if (objectp->isDead()) + if (objectp && objectp->isDead()) { - LLPointer::swap(*iter, *target); - *target = NULL; - ++target; + iter = mObjects.erase(iter); num_removed++; - - if (num_removed == mNumDeadObjects || iter->isNull()) - { - // We've cleaned up all of the dead objects or caught up to the dead tail - break; - } } else { ++iter; } } - llassert(num_removed == mNumDeadObjects); - //erase as a block - mObjects.erase(mObjects.begin()+(mObjects.size()-mNumDeadObjects), mObjects.end()); - // We've cleaned the global object list, now let's do some paranoia testing on objects // before blowing away the dead list. mDeadObjects.clear(); -- cgit v1.2.3 From 970ee73e9a9cd1c94c295c9decb4d632886c19e6 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Fri, 25 Oct 2013 11:48:43 -0700 Subject: Fix release merge issues (included upstream changes not yet in release from bear) --- indra/newview/llviewerobjectlist.cpp | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'indra/newview/llviewerobjectlist.cpp') diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index f1b959a0b7..b4e287c446 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -954,7 +954,7 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) objectp = *idle_iter; llassert(objectp->isActive()); objectp->idleUpdate(agent, world, frame_time); - } + } //update flexible objects LLVolumeImplFlexible::updateClass(); @@ -962,8 +962,8 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) //update animated textures if (gAnimateTextures) { - LLViewerTextureAnim::updateClass(); - } + LLViewerTextureAnim::updateClass(); + } } @@ -1326,27 +1326,45 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer) return; } - LLViewerObject *objectp = NULL; S32 num_removed = 0; + LLViewerObject *objectp; + + vobj_list_t::reverse_iterator target = mObjects.rbegin(); - vobj_list_t::iterator iter; - for (iter = mObjects.begin(); iter != mObjects.end();) + vobj_list_t::iterator iter = mObjects.begin(); + for ( ; iter != mObjects.end(); ) { // Scan for all of the dead objects and put them all on the end of the list with no ref count ops objectp = *iter; + if (objectp == NULL) + { //we caught up to the dead tail + break; + } - if (objectp && objectp->isDead()) + if (objectp->isDead()) { - iter = mObjects.erase(iter); + LLPointer::swap(*iter, *target); + *target = NULL; + ++target; num_removed++; + + if (num_removed == mNumDeadObjects || iter->isNull()) + { + // We've cleaned up all of the dead objects or caught up to the dead tail + break; + } } else { ++iter; } } + llassert(num_removed == mNumDeadObjects); + //erase as a block + mObjects.erase(mObjects.begin()+(mObjects.size()-mNumDeadObjects), mObjects.end()); + // We've cleaned the global object list, now let's do some paranoia testing on objects // before blowing away the dead list. mDeadObjects.clear(); -- cgit v1.2.3