diff options
author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
commit | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (patch) | |
tree | f0cc704c8af726f27164cb569cc77e6f55e533d2 /indra/newview/llviewerobject.h | |
parent | e56be73dc646d414c7a10621ac489add6762267b (diff) | |
parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) |
merge changes for 5.1.5-release
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r-- | indra/newview/llviewerobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 21c95d5533..d61832c2ad 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -412,6 +412,7 @@ public: void clearIcon(); void markForUpdate(BOOL priority); + void markForUnload(BOOL priority); void updateVolume(const LLVolumeParams& volume_params); virtual void updateSpatialExtents(LLVector4a& min, LLVector4a& max); virtual F32 getBinRadius(); |