summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2014-12-16 19:09:38 +0200
committerandreykproductengine <akleshchev@productengine.com>2014-12-16 19:09:38 +0200
commit5f288e837ce7fe0fe433c8afb7b1201b3d036a3e (patch)
tree3f1035da03854ee4c2b7e0d695edb10c39b469df
parent028e9b998ccad361256af5124c81d12eb2f65710 (diff)
MAINT-2590 FIXED Linked HUDs attached directly from inworld are invisible
-rwxr-xr-xindra/newview/lldrawable.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index c56006d9a3..73930c2115 100755
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -1117,7 +1117,14 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
retval = gPipeline.getSpatialPartition((LLViewerObject*) mVObjp);
}
else if (isRoot())
- { //must be an active volume
+ {
+ if (mSpatialBridge && (mSpatialBridge->asPartition()->mPartitionType == LLViewerRegion::PARTITION_HUD) != mVObjp->isHUDAttachment())
+ {
+ // remove obsolete bridge
+ mSpatialBridge->markDead();
+ setSpatialBridge(NULL);
+ }
+ //must be an active volume
if (!mSpatialBridge)
{
if (mVObjp->isHUDAttachment())