aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lldrawable.cpp')
-rw-r--r--linden/indra/newview/lldrawable.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index d2b2a99..ba7d6b9 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -418,7 +418,7 @@ void LLDrawable::makeStatic(BOOL warning_enabled)
418 418
419 if (mParent.notNull() && mParent->isActive() && warning_enabled) 419 if (mParent.notNull() && mParent->isActive() && warning_enabled)
420 { 420 {
421 llwarns << "Drawable becamse static with active parent!" << llendl; 421 LL_WARNS_ONCE("Drawable") << "Drawable becomes static with active parent!" << LL_ENDL;
422 } 422 }
423 423
424 S32 child_count = mVObjp->mChildList.size(); 424 S32 child_count = mVObjp->mChildList.size();
@@ -1170,11 +1170,13 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>*
1170 LLSpatialGroup* group = av->getSpatialGroup(); 1170 LLSpatialGroup* group = av->getSpatialGroup();
1171 1171
1172 BOOL impostor = objparent->isAvatar() && ((LLVOAvatar*) objparent)->isImpostor(); 1172 BOOL impostor = objparent->isAvatar() && ((LLVOAvatar*) objparent)->isImpostor();
1173 1173 BOOL loaded = objparent->isAvatar() && ((LLVOAvatar*) objparent)->isFullyLoaded();
1174
1174 if (!group || 1175 if (!group ||
1175 av->getSpatialGroup()->mDistance > LLVOAvatar::sRenderDistance || 1176 av->getSpatialGroup()->mDistance > LLVOAvatar::sRenderDistance ||
1176 LLDrawable::getCurrentFrame() - av->mVisible > 1 || 1177 LLDrawable::getCurrentFrame() - av->mVisible > 1 ||
1177 impostor) 1178 impostor ||
1179 !loaded)
1178 { 1180 {
1179 return; 1181 return;
1180 } 1182 }