diff options
author | simon@lindenlab.com <simon@lindenlab.com> | 2011-07-07 17:46:18 -0700 |
---|---|---|
committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-07-07 17:46:18 -0700 |
commit | 1cf5ce3a436297e0ac2293eacae7428f231fe1ec (patch) | |
tree | 4a074ab4bebd09ff53df696954f0f091cd48327c /indra/newview/llvoavatar.cpp | |
parent | f5bd2109c27b098dd73a9578f1f032b6ff9e4c2d (diff) | |
parent | 66dcc72870b19c6ada65a643ca33c779c9c9989b (diff) |
Merge latest from viewer trunk
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index be5f772185..3f98df9eb9 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8242,6 +8242,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) { @@ -8251,6 +8253,8 @@ void LLVOAvatar::updateImpostors() gPipeline.generateImpostor(avatar); } } + + LLCharacter::sAllowInstancesChange = TRUE ; } BOOL LLVOAvatar::isImpostor() const |