diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-30 23:21:23 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-09-30 23:21:23 -0400 |
| commit | 2fb337bc12984f9abecfbc7f3918c372a7b5ac6c (patch) | |
| tree | 9be20d7e6953269766bdb408325e952140880ef1 /indra/newview/lldrawpoolwater.cpp | |
| parent | e045d212d35354d679c2d2e05c6d4689f9f8ac95 (diff) | |
STORM-1126 WIP Windlight Estate Settings port from 1.23: second pass at getting windlight ported to V2.
Lots of cleanup in the floater classes. Not sure every decision was correct
but it compiles now. Doesn't link yet.
(resubmitted by Vadim ProductEngine)
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index ce1b899d55..213b95b119 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -103,7 +103,7 @@ void LLDrawPoolWater::prerender() // got rid of modulation by light color since it got a little too // green at sunset and sl-57047 (underwater turns black at 8:00) - sWaterFogColor = LLWaterParamManager::instance()->getFogColor(); + sWaterFogColor = LLWaterParamManager::instance().getFogColor(); sWaterFogColor.mV[3] = 0; } @@ -433,7 +433,7 @@ void LLDrawPoolWater::shade() //bind normal map S32 bumpTex = shader->enableTexture(LLViewerShaderMgr::BUMP_MAP); - LLWaterParamManager * param_mgr = LLWaterParamManager::instance(); + LLWaterParamManager * param_mgr = &LLWaterParamManager::instance(); // change mWaterNormp if needed if (mWaterNormp->getID() != param_mgr->getNormalMapID()) |