diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-20 15:37:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-20 15:37:54 -0500 |
| commit | a830812172d7eb163c06ead3155dc4b43ded4346 (patch) | |
| tree | 15e22236fec9f04faaeea253b2dfd80caa2f10d6 | |
| parent | 7ab282a09c1f8c11f383d4492fc58b0b06b8338a (diff) | |
| parent | 903b68a3ec79757802a4bf576ab5da070544f2e6 (diff) | |
merge changes for DRTVWR-247
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 15 |
2 files changed, 3 insertions, 13 deletions
@@ -365,3 +365,4 @@ f1d3b3fcab28ed9ea532bf50db0ba96f5c8cc8e9 DRTVWR-232 94ab2b49458ab372a95d2d6949fdf574f413068d 3.4.3-beta1 4c3460cb1fb7c6da9965e09c734d282a8e9c81f0 DRTVWR-229 f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246 +39c5204b6e800983a41ccac8ad6dc993120197c6 DRTVWR-247 diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index f5bf900d0d..28d195d5e9 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -96,18 +96,6 @@ LLVolumeImplFlexible::~LLVolumeImplFlexible() //static void LLVolumeImplFlexible::updateClass() { - // 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(); @@ -121,7 +109,6 @@ void LLVolumeImplFlexible::updateClass() } ++delay_iter; } -#endif // XXX_STINSON_MAINT_1890_HACK_FIX } LLVector3 LLVolumeImplFlexible::getFramePosition() const @@ -373,6 +360,8 @@ void LLVolumeImplFlexible::doIdleUpdate() F32 pixel_area = mVO->getPixelArea(); U32 update_period = (U32) (LLViewerCamera::getInstance()->getScreenPixelArea()*0.01f/(pixel_area*(sUpdateFactor+1.f)))+1; + // MAINT-1890 Clamp the update period to ensure that the update_period is no greater than 32 frames + update_period = llclamp(update_period, 0U, 32U); if (visible) { |