summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-01 09:41:10 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-07-01 09:41:10 -0400
commit4bce553a96dc6d75279f2c2b35fb8060a3f6bae1 (patch)
tree70c1b0c2b43f2649777eb8cac7eb927906034640 /indra/newview/llvoavatar.cpp
parenta1fb8ae0d0679499a68fb8dd1965ab5026878c73 (diff)
parent662a92784328f31b680f4f049350dd0f6cacf4c7 (diff)
merge viewer-development -> mesh-development
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