summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-26 20:37:39 -0500
committerDave Parks <davep@lindenlab.com>2011-05-26 20:37:39 -0500
commit35c4635dca83708a09ac8f15e30aec146210fba7 (patch)
treed821a4c5cfa4ce614eb79d85f7f3a4c0485f6ce4 /indra/newview/lldrawable.cpp
parent99bd9bb56ba8d834c91955940801b6d2ac46e627 (diff)
parent53e890f4fdab1ab014b745c5d872b240b8c4ce76 (diff)
merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 7db13868d6..ad3710843c 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -94,7 +94,9 @@ void LLDrawable::init()
mRenderType = 0;
mCurrentScale = LLVector3(1,1,1);
mDistanceWRTCamera = 0.0f;
-
+ mPositionGroup.clear();
+ mExtents[0].clear();
+ mExtents[1].clear();
mQuietCount = 0;
mState = 0;
@@ -587,7 +589,10 @@ void LLDrawable::setRadius(F32 radius)
void LLDrawable::moveUpdatePipeline(BOOL moved)
{
- makeActive();
+ if (moved)
+ {
+ makeActive();
+ }
// Update the face centers.
for (S32 i = 0; i < getNumFaces(); i++)