diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-07-18 18:43:58 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-07-18 18:43:58 -0400 |
| commit | 38b3da4a20a0a06396d240a5e8fdc4fa11866937 (patch) | |
| tree | 90613c999899253eb28caf04641b5ee41d827958 /indra/newview/lldrawable.h | |
| parent | d027db3cfc7c757cc8846e1a5187d1a816f63d9a (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merge. Refresh from viewer-release.
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rwxr-xr-x | indra/newview/lldrawable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 4420a34fae..c3f6d77edc 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); |