summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-04-20 18:22:02 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-04-20 18:22:02 -0400
commit87512a6e5d13b1c3840d299708da85f8e3ac1955 (patch)
tree162ee433210401f68c7d3eeb6c3120d9c67677de /indra/newview
parentec11823c77ac232d59f4b9ddcff354523b6e0f73 (diff)
re-applying fix from previous mesh-dev merge branch
SH-1062 FIX Flexi sculpts is a mess until you zoom in.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llflexibleobject.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index bd939d8636..3d1650d2f5 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -366,7 +366,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
LLFastTimer ftm(FTM_DO_FLEXIBLE_UPDATE);
LLVolume* volume = mVO->getVolume();
LLPath *path = &volume->getPath();
- if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible())
+ if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) // if its uninitialized but not visible, what then? - Nyx
{
mVO->markForUpdate(TRUE);
if (!doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0))
@@ -375,11 +375,6 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
}
}
- if (!mVO->mDrawable->isVisible())
- {
- return;
- }
-
llassert_always(mInitialized);
S32 num_sections = 1 << mSimulateRes;