diff options
| author | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
| commit | de78d17e912b7e2a4c563a7a428f11cce33644c0 (patch) | |
| tree | 6c415389f180f6a5d879b050670fd6cd3d987229 /indra/llprimitive/llprimitive.h | |
| parent | 888b39c283e53fd128778e70e231bcb6053de4b8 (diff) | |
| parent | 1361eeae4e4538c175a32d48246897c4659cc26c (diff) | |
Merge from viewer-experience
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; }; |