diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 12:34:15 -0500 |
commit | 8a92612fd976b6e38383d9ee46be5b51053e0998 (patch) | |
tree | 0c06d99c2b6a8aaa5c78661b488ff8b59b83c523 /indra/llprimitive/llprimitive.h | |
parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
parent | d6fda15c34896db3b911c3719871ce317edaab1d (diff) |
merge
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
-rw-r--r-- | indra/llprimitive/llprimitive.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h index d981b248fa..76faa1b8c5 100644 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -323,7 +323,7 @@ public: const LLVolume *getVolumeConst() const { return mVolumep; } // HACK for Windoze confusion about ostream operator in LLVolume LLVolume *getVolume() const { return mVolumep; } virtual BOOL setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false); - + // Modify texture entry properties inline BOOL validTE(const U8 te_num) const; LLTextureEntry* getTE(const U8 te_num) const; @@ -444,6 +444,7 @@ protected: U8 mNumTEs; // # of faces on the primitve U32 mMiscFlags; // home for misc bools +public: static LLVolumeMgr* sVolumeManager; }; |