diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-02 19:01:27 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-02 19:01:27 -0600 |
| commit | bb113f75efefffc1f976267be6d722289929e596 (patch) | |
| tree | a7e480edc072f73ed7f25a2f370592e3c750347a | |
| parent | 9e966bfe9fd15f9ffbc969fc41ef2306e9f9409c (diff) | |
SH-900 Fix for only lowest LoD appearing for objects in neighboring regions.
| -rw-r--r-- | indra/newview/lldrawable.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llface.cpp | 3 |
2 files changed, 3 insertions, 8 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 { diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 15f59e84a6..bb1a46df5f 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -761,8 +761,7 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f, mCenterLocal.set(t.getF32ptr()); t.setSub(newMax,newMin); - t.mul(0.5f); - mBoundingSphereRadius = t.getLength3().getF32(); + mBoundingSphereRadius = t.getLength3().getF32()*0.5f; updateCenterAgent(); } |