diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-05 19:44:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-05 19:44:47 -0400 |
| commit | a08c362d88487a390de340d75c3394c8800546be (patch) | |
| tree | 1d4a25d8df0a07b85f135cb6359b4d6c8f37fe76 /indra/newview/lldrawpoolwater.cpp | |
| parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) | |
| parent | 0c7f003bfc3bb9f74b0194ce18861514efe77066 (diff) | |
merge up latest viewer-development
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()) |