diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
| commit | 1108cd0e5c052176f9dacc69b04d702a06b744de (patch) | |
| tree | 21b0be76071d28b165f99f57086ce9a16c79bb34 /indra/newview/lldrawable.h | |
| parent | 2268bf38339178f93b317693c0a6808807301d64 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
merge changes for 3.6.0-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); |