diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-11-09 23:05:35 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-11-09 23:05:35 +0200 |
| commit | 84222286ccb5ebb50e5f4da2dd5d4e87253b37d4 (patch) | |
| tree | 11e7823583dfab957061e9387b06ca9547a62af1 | |
| parent | d97d7c52068b71bd99b10db046c6a0688b61a254 (diff) | |
MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c98c974e62..88322bdfe1 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -217,6 +217,7 @@ Ansariel Hiller MAINT-6519 MAINT-7899 STORM-2105 + MAINT-6917 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 1d083bb2fd..2f17fb54ad 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -11622,7 +11622,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar) avatar->setImpostorDim(tdim); - LLVOAvatar::sUseImpostors = true; // @TODO ??? + LLVOAvatar::sUseImpostors = (0 != LLVOAvatar::sMaxNonImpostors); sUseOcclusion = occlusion; sReflectionRender = false; sImpostorRender = false; |