diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-17 13:40:11 -0800 |
| commit | 53495d74ee380d492cfed0af91f7660f49619a9f (patch) | |
| tree | 5992e4769c9acbecc900710048a8eeb4a7806ae4 /indra/llprimitive/llprimitive.h | |
| parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) | |
| parent | c02702f3871979cb7745b49aa502ac3c71f77681 (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
| -rw-r--r-- | indra/llprimitive/llprimitive.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h index 4f828186cb..4db7aa7261 100644 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -328,7 +328,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; |