summaryrefslogtreecommitdiff
path: root/indra/newview/llavatarrenderinfoaccountant.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-05-13 18:34:54 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-05-13 18:34:54 -0400
commit73f474d886d2430db3d5c8f7729f769b389730a4 (patch)
tree5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /indra/newview/llavatarrenderinfoaccountant.cpp
parent81ffd3fccac709a5903dd0d7572db50c50850347 (diff)
parent180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff)
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
Diffstat (limited to 'indra/newview/llavatarrenderinfoaccountant.cpp')
-rw-r--r--indra/newview/llavatarrenderinfoaccountant.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index 54144677f4..da4b6cf806 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -249,7 +249,7 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio
{
LLVOAvatar* avatar = dynamic_cast<LLVOAvatar*>(*iter);
if (avatar &&
- avatar->getRezzedStatus() == 2 && // Fully rezzed
+ avatar->getRezzedStatus() >= 2 && // Mostly rezzed (maybe without baked textures downloaded)
!avatar->isDead() && // Not dead yet
avatar->getObjectHost() == regionp->getHost()) // Ensure it's on the same region
{