diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
| commit | 8ed056fde9fe5fc9755158013a5cb8be73066e2c (patch) | |
| tree | d7f5f6de35c99ca645e48dc8817d908cc6d2f348 /indra/newview/lldrawpoolsky.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
svn merge -r124872:124873
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a
QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
Diffstat (limited to 'indra/newview/lldrawpoolsky.h')
| -rw-r--r-- | indra/newview/lldrawpoolsky.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/lldrawpoolsky.h b/indra/newview/lldrawpoolsky.h index f35b114730..8595d73aee 100644 --- a/indra/newview/lldrawpoolsky.h +++ b/indra/newview/lldrawpoolsky.h @@ -36,14 +36,12 @@ #include "lldrawpool.h" class LLSkyTex; -class LLHeavenBody; class LLGLSLShader; class LLDrawPoolSky : public LLFacePool { private: LLSkyTex *mSkyTex; - LLHeavenBody *mHB[2]; // Sun and Moon LLGLSLShader *mShader; public: @@ -69,8 +67,6 @@ public: /*virtual*/ void renderForSelect(); /*virtual*/ void endRenderPass(S32 pass); void setSkyTex(LLSkyTex* const st) { mSkyTex = st; } - void setSun(LLHeavenBody* sun_flag) { mHB[0] = sun_flag; } - void setMoon(LLHeavenBody* moon) { mHB[1] = moon; } void renderSkyCubeFace(U8 side); void renderHeavenlyBody(U8 hb, LLFace* face); |