diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 12:10:10 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 12:10:10 -0500 |
commit | a22bb00530bb779d8e5bb40b68e55767604d88dc (patch) | |
tree | 520019b0c1e8c9cf475d19a60a0322a3c1caea6e /indra/newview/llvovolume.h | |
parent | 0904cbe4846192c9897267c9a60175f84881f9ed (diff) | |
parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llvovolume.h')
-rw-r--r-- | indra/newview/llvovolume.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 6bad245e19..06e214b41e 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -100,6 +100,7 @@ public: public: LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); + /*virtual*/ void markDead(); // Override (and call through to parent) to clean up media references /*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline); |