summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-14 18:20:55 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-14 18:20:55 -0400
commit4dba69b04ab9825f1cd4b8dbf855494a3897ffd7 (patch)
tree2f3a5324daf25ccea323ce5caa8dc238b6e37bbe /indra/newview/llviewerobject.cpp
parent9b7640d70ae820a954634ecf0dae43dfb33c0d3a (diff)
parent67f6625c56406604197507c842496f031eb0986f (diff)
Automated merge with file:///Users/nat/linden/viewer-no-vstool
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 624c48e945..239e357cdd 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5894,6 +5894,14 @@ void LLViewerObject::markForUpdate(BOOL priority)
}
}
+void LLViewerObject::markForUnload(BOOL priority)
+{
+ if (mDrawable.notNull())
+ {
+ gPipeline.markRebuild(mDrawable, LLDrawable::FOR_UNLOAD, priority);
+ }
+}
+
bool LLViewerObject::isPermanentEnforced() const
{
return flagObjectPermanent() && (mRegionp != gAgent.getRegion()) && !gAgent.isGodlike();