diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
| commit | 26f321bf6530734173792f92316b32c470cc1b20 (patch) | |
| tree | b6c913bc714ce29ee559a0da49c6318051637789 /indra/llprimitive/llprimitive.h | |
| parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) | |
| parent | 8ae550996c70df16b707f6773666b93409123689 (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; }; |