diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-28 15:48:00 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 15:48:00 -0500 |
| commit | f3afac420cd3c89eb396fb1f0b77ab4804212415 (patch) | |
| tree | ee0dc579be3ee077eddb6bfae5eb99164b736566 /indra/newview/llviewerobject.cpp | |
| parent | fd578f1136301a3b5574e213b39743635f8cff14 (diff) | |
| parent | 39ee498af0b7e1381b6249365550f21024ef1ef8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 4e7055f0bb..f5a3681437 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5363,8 +5363,11 @@ BOOL LLViewerObject::setFlags(U32 flags, BOOL state) void LLViewerObject::setPhysicsShapeType(U8 type) { mPhysicsShapeUnknown = false; - mPhysicsShapeType = type; - mCostStale = true; + if (type != mPhysicsShapeType) + { + mPhysicsShapeType = type; + mCostStale = true; + } } void LLViewerObject::setPhysicsGravity(F32 gravity) @@ -5391,7 +5394,6 @@ U8 LLViewerObject::getPhysicsShapeType() const { if (mPhysicsShapeUnknown) { - mPhysicsShapeUnknown = false; gObjectList.updatePhysicsFlags(this); } |