diff options
| author | Aura Linden <aura@lindenlab.com> | 2013-07-11 17:49:13 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2013-07-11 17:49:13 -0700 |
| commit | ce9962b33872db65b70c9b10901ec9062cb59169 (patch) | |
| tree | 94be5367128e241ef1c6f802e8551a9b4ed786ff /indra/newview/lldrawable.h | |
| parent | 8642f57dd95864ec6b002f6519701f30866c6502 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merged in viewer-release
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/lldrawable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 4608d16fec..c3f6d77edc 100644..100755 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -145,6 +145,8 @@ public: //void removeFace(const S32 i); // SJB: Avoid using this, it's slow LLFace* addFace(LLFacePool *poolp, LLViewerTexture *texturep); LLFace* addFace(const LLTextureEntry *te, LLViewerTexture *texturep); + LLFace* addFace(const LLTextureEntry *te, LLViewerTexture *texturep, LLViewerTexture *normalp); + LLFace* addFace(const LLTextureEntry *te, LLViewerTexture *texturep, LLViewerTexture *normalp, LLViewerTexture *specularp); void deleteFaces(S32 offset, S32 count); void setNumFaces(const S32 numFaces, LLFacePool *poolp, LLViewerTexture *texturep); void setNumFacesFast(const S32 numFaces, LLFacePool *poolp, LLViewerTexture *texturep); @@ -284,7 +286,6 @@ public: NEARBY_LIGHT = 0x00200000, // In gPipeline.mNearbyLightSet BUILT = 0x00400000, FORCE_INVISIBLE = 0x00800000, // stay invis until CLEAR_INVISIBLE is set (set of orphaned) - CLEAR_INVISIBLE = 0x01000000, // clear FORCE_INVISIBLE next draw frame REBUILD_SHADOW = 0x02000000, HAS_ALPHA = 0x04000000, RIGGED = 0x08000000, |