diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-02 19:03:03 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-02 19:03:03 -0600 |
| commit | 5bd5d918caa63338a678e2c94db9195f77867e8a (patch) | |
| tree | 4293c41109adb4b77ec6d0c4d5aec741bd7d092f /indra/newview/lldrawable.cpp | |
| parent | 33f82d788502a036953b676bfcb709d968b2a569 (diff) | |
| parent | bb113f75efefffc1f976267be6d722289929e596 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 73c4cf94ef..cbee800acb 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -709,11 +709,7 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) if (volume) { pos.set(getPositionGroup().getF32ptr()); - if (isStatic()) - { - pos += volume->getRegion()->getOriginAgent(); - } - + if (isState(LLDrawable::HAS_ALPHA)) { for (S32 i = 0; i < getNumFaces(); i++) @@ -733,7 +729,7 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) facep->mDistance = v * camera.getAtAxis(); } } - } + } } else { |