diff options
author | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:34:21 +0100 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:34:21 +0100 |
commit | 37e8fd20c3823482f3a15b4bfd544f7847070db8 (patch) | |
tree | b31e3a1ef86431cda7703621f779b38a98c14a3e /indra/newview/llviewerobject.cpp | |
parent | 64302d3000b69b31e72eb6a3bd8a981c80cb88de (diff) | |
parent | bd84cbfa11fbe2b3aa5ceba5978841310488b8e4 (diff) |
Merge to 5.1.6
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r-- | indra/newview/llviewerobject.cpp | 8 |
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(); |