summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-12 19:35:34 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-12 19:35:34 -0800
commitc137b645b6c0c9ad87e064bba59c91a22ecb62f8 (patch)
treeeefa42f3d9a54fcbb099911df6ac6cadb2388208 /indra
parent93995ada0561e75efdf3f532cf638fbcb1d2ee69 (diff)
MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring the sUpdateDelay value and simply updating all flexi-prims. This change most likely reduces frame rate.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llflexibleobject.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index 43be28ce71..f04356dc60 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -96,6 +96,7 @@ LLVolumeImplFlexible::~LLVolumeImplFlexible()
//static
void LLVolumeImplFlexible::updateClass()
{
+#ifdef XXX_STINSON_HACK_FIX
std::vector<S32>::iterator delay_iter = sUpdateDelay.begin();
for (std::vector<LLVolumeImplFlexible*>::iterator iter = sInstanceList.begin();
@@ -109,6 +110,14 @@ 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
}
LLVector3 LLVolumeImplFlexible::getFramePosition() const