From 3925e37532476c526375fd76143b2b5e1dcce9b9 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 15 May 2018 17:17:51 -0700
Subject: Fix the blend code to record the amount of the blend and to store
 what is being blended towards.

---
 indra/newview/llvosky.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'indra/newview/llvosky.cpp')

diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 61500aebfe..9ba6aeb37f 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -2105,6 +2105,50 @@ void LLVOSky::setSunDirection(const LLVector3 &sun_dir, const LLVector3 &moon_di
 	}
 }
 
+// void LLVOSky::checkAndLoadSkyTextures(LLDrawPoolWLSky *pskypool)
+// {
+//     LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();
+// 
+//     if (mMoonCurrentId != psky->getMoonTextureId())
+//     {
+//         mMoonCurrentId = psky->getMoonTextureId();
+//         if (mMoonCurrentId.isNull())
+//         {
+//             mMoonTexturep = NULL;
+//             mMoon.setDraw(FALSE);
+//         }
+//         else
+//         {
+//             mMoonTexturep = LLViewerTextureManager::getFetchedTexture(mMoonCurrentId, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI);
+//             if (mMoonTexturep)
+//             {
+//                 mMoonTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
+//             }
+//             mMoon.setDraw(TRUE);
+//         }
+//         mFace[FACE_MOON] = mDrawable->addFace(pskypool, mMoonTexturep);
+//     }
+// 
+//     if (mSunCurrentId != psky->getSunTextureId())
+//     {
+//         mSunCurrentId = psky->getSunTextureId();
+//         if (mSunCurrentId.isNull())
+//         {
+//             mSunTexturep = NULL;
+//             mSun.setDraw(FALSE);
+//         }
+//         else
+//         {
+//             mSunTexturep = LLViewerTextureManager::getFetchedTexture(mSunCurrentId, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI);
+//             if (mSunTexturep)
+//             {
+//                 mSunTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
+//             }
+//             mSun.setDraw(TRUE);
+//         }
+//         mFace[FACE_SUN] = mDrawable->addFace(pskypool, mSunTexturep);
+//     }
+// }
 
 LLColor4U LLVOSky::getFadeColor() const
 { 
-- 
cgit v1.2.3