diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-19 18:09:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-19 18:09:34 -0500 |
| commit | c030e3a51dac452936bc67690eedefe9fb5092d5 (patch) | |
| tree | 1cb2c1d0f85d0863d5a0dbcddaa3dcb2e680c0c3 /indra/newview/llflexibleobject.cpp | |
| parent | 0ff6275a654eda55662fab8d89d9ff4d278438d8 (diff) | |
| parent | 029103133ebac7ee13f1af767f41b012d19a84f5 (diff) | |
merge
Diffstat (limited to 'indra/newview/llflexibleobject.cpp')
| -rw-r--r-- | indra/newview/llflexibleobject.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp index c4dca4cb79..ef8d11a2e2 100644 --- a/indra/newview/llflexibleobject.cpp +++ b/indra/newview/llflexibleobject.cpp @@ -303,15 +303,10 @@ void LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6 if (drawablep) { //LLFastTimer ftm(FTM_FLEXIBLE_UPDATE); - - //flexible objects never go static - drawablep->mQuietCount = 0; - if (!drawablep->isRoot()) - { - LLViewerObject* parent = (LLViewerObject*) mVO->getParent(); - parent->mDrawable->mQuietCount = 0; - } - + + //ensure drawable is active + drawablep->makeActive(); + if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE)) { bool visible = drawablep->isVisible(); |