diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-12 11:55:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-12 11:55:54 +0100 |
| commit | f8f1e30ac385906230ef0532c0a68aff293de4cb (patch) | |
| tree | ff932bd127278e8d6fd6f9f29056b8c89dc8260c /indra/newview/lltexlayer.h | |
| parent | e9a94a04ff3562742c52bba45b8377fce9eeaad6 (diff) | |
| parent | d6996c7d3da4ddbb81a7758e508c1aa477d4edc4 (diff) | |
slightly-hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/lltexlayer.h')
| -rw-r--r-- | indra/newview/lltexlayer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.h b/indra/newview/lltexlayer.h index 5be58f64a9..ae280dd063 100644 --- a/indra/newview/lltexlayer.h +++ b/indra/newview/lltexlayer.h @@ -325,6 +325,7 @@ public: LLTexLayerSetBuffer(LLTexLayerSet* const owner, S32 width, S32 height); virtual ~LLTexLayerSetBuffer(); + /*virtual*/ S8 getType() const ; virtual void preRender(BOOL clear_depth); virtual void postRender(BOOL success); virtual BOOL render(); |