Merge branch 'mccabe-plugins' into plugins_merge

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/GStreamer.cmake
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/llmedia/CMakeLists.txt
	linden/indra/llprimitive/material_codes.h
	linden/indra/newview/chatbar_as_cmdline.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

1 files changed, 4 insertions, 0 deletions

diff --git a/linden/indra/newview/lldrawpoolsky.h b/linden/indra/newview/lldrawpoolsky.h
index 8595d73..f35b114 100644
--- a/linden/indra/newview/lldrawpoolsky.h
+++ b/linden/indra/newview/lldrawpoolsky.h
@@ -36,12 +36,14 @@
 #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:
@@ -67,6 +69,8 @@ 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);