summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-05-14 20:37:36 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-05-14 20:37:36 +0300
commit7d46d6fb21c21092b7dcaa3357a0698bf9d44794 (patch)
tree23f231cbdbd43488828c9fc5d5440b48eb2097d2 /indra
parent76d843ed20d15f2541de0aecdf0648531d7be6f5 (diff)
SL-12026 Fix issue with constant bridge recreation for animeshes
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lldrawable.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index ad19574b44..2219f20272 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -1182,7 +1182,8 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
{
U32 partition_type = mSpatialBridge->asPartition()->mPartitionType;
bool is_hud = mVObjp->isHUDAttachment();
- bool is_attachment = mVObjp->isAttachment() && !is_hud;
+ bool is_animesh = mVObjp->isAnimatedObject() && mVObjp->getControlAvatar() != NULL;
+ bool is_attachment = mVObjp->isAttachment() && !is_hud && !is_animesh;
if ((partition_type == LLViewerRegion::PARTITION_HUD) != is_hud)
{
// Was/became HUD
@@ -1190,7 +1191,7 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
mSpatialBridge->markDead();
setSpatialBridge(NULL);
}
- else if ((partition_type == LLViewerRegion::PARTITION_CONTROL_AV) != (mVObjp->isAnimatedObject() && mVObjp->getControlAvatar() != NULL))
+ else if ((partition_type == LLViewerRegion::PARTITION_CONTROL_AV) != is_animesh)
{
// Was/became part of animesh
// remove obsolete bridge