summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-03-04 14:15:52 -0800
committerTofu Buzzard <no-email>2011-03-04 14:15:52 -0800
commit59c3af8b40a6857871b81da85ca41554929373f2 (patch)
tree1a9c97c5ed38886eed3c7efc83701aaedee609d4 /indra/newview/lldrawable.cpp
parentcc61ad696e6947111f61453daf9840415045c64f (diff)
parent6a86c65e46f92f1a955d31e2d0b9d7ffcd171134 (diff)
merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp9
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))
{