diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-05 20:47:39 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-05 20:47:39 +0300 |
| commit | a2c4bb80492132f7981a79e61bd8ddec95ad97dd (patch) | |
| tree | 0aedf927a4a228fb4c4d59905a81d814762ed453 /indra/newview/lldrawpoolwater.cpp | |
| parent | 2787be7d3558c3ca1ed15863e875612b1b27ec78 (diff) | |
| parent | 5a0547cdc366678a21c23ac4669d9e1a867ca331 (diff) | |
STORM-1126 merge 2
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 dc94924da4..31c14361b5 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -108,7 +108,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; } @@ -527,7 +527,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()) |