From 951b4c3efbdb19ea2af6f26f420bca43edf75273 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Tue, 13 Nov 2012 15:23:15 -0800
Subject: [PATCH] MAINT-1890: Adding a more descriptive comment to this hack
fix for future reference.
---
indra/newview/llflexibleobject.cpp | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index f04356dc60d..f5bf900d0da 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -96,7 +96,18 @@ LLVolumeImplFlexible::~LLVolumeImplFlexible()
//static
void LLVolumeImplFlexible::updateClass()
{
-#ifdef XXX_STINSON_HACK_FIX
+ // XXX stinson 11/13/2012 : This hack removes the optimization for limiting the number of flexi-prims
+ // updated. With the optimization, flexi-prims attached to the users avatar were not being
+ // animated correctly immediately following teleport. With the optimization removed, the bug went away.
+#define XXX_STINSON_MAINT_1890_HACK_FIX 1
+#if XXX_STINSON_MAINT_1890_HACK_FIX
+ for (std::vector<LLVolumeImplFlexible*>::iterator iter = sInstanceList.begin();
+ iter != sInstanceList.end();
+ ++iter)
+ {
+ (*iter)->doIdleUpdate();
+ }
+#else // XXX_STINSON_MAINT_1890_HACK_FIX
std::vector<S32>::iterator delay_iter = sUpdateDelay.begin();
for (std::vector<LLVolumeImplFlexible*>::iterator iter = sInstanceList.begin();
@@ -110,14 +121,7 @@ void LLVolumeImplFlexible::updateClass()
}
++delay_iter;
}
-#else // XXX_STINSON_HACK_FIX
- for (std::vector<LLVolumeImplFlexible*>::iterator iter = sInstanceList.begin();
- iter != sInstanceList.end();
- ++iter)
- {
- (*iter)->doIdleUpdate();
- }
-#endif // XXX_STINSON_HACK_FIX
+#endif // XXX_STINSON_MAINT_1890_HACK_FIX
}
LLVector3 LLVolumeImplFlexible::getFramePosition() const
--
GitLab