summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-01 10:09:03 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-01 10:09:03 -0400
commit3da45a3cd1e4a7984e2e41ab92ad9f97166aa3a6 (patch)
treebe99785bd263e745020de6456e6449ca9da62f3d /indra/newview/llvoavatar.cpp
parent1716b8428f88989b2b8898e27cc137e7746a4805 (diff)
parent021ce5ccaf10e140fe114c586466ccea8ea7dbdf (diff)
merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r--indra/newview/llvoavatar.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 4a9756bb88..27f3a26f83 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -8245,6 +8245,8 @@ U32 LLVOAvatar::getPartitionType() const
//static
void LLVOAvatar::updateImpostors()
{
+ LLCharacter::sAllowInstancesChange = FALSE ;
+
for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
iter != LLCharacter::sInstances.end(); ++iter)
{
@@ -8254,6 +8256,8 @@ void LLVOAvatar::updateImpostors()
gPipeline.generateImpostor(avatar);
}
}
+
+ LLCharacter::sAllowInstancesChange = TRUE ;
}
BOOL LLVOAvatar::isImpostor() const