diff options
| author | Tofu Buzzard <no-email> | 2011-02-02 17:42:18 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-02 17:42:18 -0800 |
| commit | 8e133ef2e30973ddda886ed71a0b4873fe384baf (patch) | |
| tree | 38db2ba3b2c67378b594f67a06f22111c1d3e975 /indra/newview/lldrawable.cpp | |
| parent | 0d1d61680ac8ab12256ef0d180ab00ee8799cb0a (diff) | |
| parent | 46c9f61abdd9326c7a52159370b20800941c72fa (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 { |