summaryrefslogtreecommitdiff
path: root/indra/newview/llvosky.h
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-08-12 13:44:59 -0700
committerGraham Linden <graham@lindenlab.com>2019-08-12 13:44:59 -0700
commit41c7523e08aab7f2bf4a040ac1c1c8a1d24babed (patch)
treeb8a36a5667815b87929c11917c3800ed90e1061a /indra/newview/llvosky.h
parent71af0a2a9e9f90d1e336f8a30f642bb5e19ef658 (diff)
SL-11676
Make sun/moon textures render on Low/Low-Mid again. Fix solar additive being present when moon was only heavenly body in sky.
Diffstat (limited to 'indra/newview/llvosky.h')
-rw-r--r--indra/newview/llvosky.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h
index 8c2817e1ed..5f27085599 100644
--- a/indra/newview/llvosky.h
+++ b/indra/newview/llvosky.h
@@ -57,13 +57,8 @@ private:
LLColor4 *mSkyData;
LLVector3 *mSkyDirs; // Cache of sky direction vectors
static S32 sCurrent;
- static F32 sInterpVal;
public:
- static F32 getInterpVal() { return sInterpVal; }
- static void setInterpVal(const F32 v) { sInterpVal = v; }
- static BOOL doInterpolate() { return sInterpVal > 0.001f; }
-
void bindTexture(BOOL curr = TRUE);
protected:
@@ -299,6 +294,8 @@ public:
LLFace *mFace[FACE_COUNT];
LLVector3 mBumpSunDir;
+ F32 getInterpVal() const { return mInterpVal; }
+
protected:
~LLVOSky();