diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/lldrawpooltree.h | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/lldrawpooltree.h')
| -rw-r--r-- | indra/newview/lldrawpooltree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lldrawpooltree.h b/indra/newview/lldrawpooltree.h index 7dee2382b2..c414ebcea9 100644 --- a/indra/newview/lldrawpooltree.h +++ b/indra/newview/lldrawpooltree.h @@ -55,14 +55,13 @@ public: /*virtual*/ void beginRenderPass( S32 pass ); /*virtual*/ void render(S32 pass = 0); /*virtual*/ void endRenderPass( S32 pass ); + /*virtual*/ S32 getNumPasses() { return 1; } /*virtual*/ void renderForSelect(); /*virtual*/ BOOL verify() const; /*virtual*/ LLViewerImage *getTexture(); /*virtual*/ LLViewerImage *getDebugTexture(); /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display - virtual S32 getMaterialAttribIndex(); - static S32 sDiffTex; private: |