diff options
| author | Tofu Buzzard <no-email> | 2011-03-04 14:15:58 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-04 14:15:58 -0800 |
| commit | 63d913adb15f376046c3924a2eaba3dd3a396935 (patch) | |
| tree | 91a6ae4ee659f650dee4991fa919be489bd09e84 /indra/newview/lldrawable.cpp | |
| parent | d95c5ef6230ab9488bfa925924599a883452c64c (diff) | |
| parent | 59c3af8b40a6857871b81da85ca41554929373f2 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index fe743e7451..bdc12ec0e3 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -708,7 +708,14 @@ void LLDrawable::updateDistance(LLCamera& camera, bool force_update) LLVOVolume* volume = getVOVolume(); if (volume) { - pos.set(getPositionGroup().getF32ptr()); + if (getSpatialGroup()) + { + pos.set(getPositionGroup().getF32ptr()); + } + else + { + pos = getPositionAgent(); + } if (isState(LLDrawable::HAS_ALPHA)) { |
