summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-27 12:34:05 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-27 12:34:05 +0100
commit617e9614455fb8c70fb6c219ceeab0b53adf25b5 (patch)
tree8e79762251a307cedbac037ece893cf12b0ef9b2 /indra/newview/lldrawable.cpp
parente5273960de222ffae32405fde8e9fd566ff72d0a (diff)
parentd0a6165713aa94654f7948151c6fbbe0a7d315f2 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 38eda5bd2e..ed6a791e7f 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -523,7 +523,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
{
// snap to final position
dist_squared = 0.0f;
- if (!isRoot())
+ if (getVOVolume() && !isRoot())
{ //child prim snapping to some position, needs a rebuild
gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
}