diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-18 20:05:35 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-18 20:05:35 +0000 |
| commit | 030afe0aaa0c956caa5509bca433c056eaf284fd (patch) | |
| tree | 478efa590b8adc1473d47964472cae119ec7147e /indra/newview/lldrawpoolwater.cpp | |
| parent | c5283f63ab6571a3f48f30cc4eb2dbab3f0633ce (diff) | |
| parent | 862b8f72dc4d89e88b0c03992dad393aff9451a5 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #96)
SL-1176 and SL-9685
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 7f1601e604..4dd0d3ec98 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -76,10 +76,10 @@ void LLDrawPoolWater::setTransparentTextures(const LLUUID& transparentTextureId, mWaterImagep[1]->addTextureStats(1024.f*1024.f); } -void LLDrawPoolWater::setOpaqueTexture() +void LLDrawPoolWater::setOpaqueTexture(const LLUUID& opaqueTextureId) { LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater(); - mOpaqueWaterImagep = LLViewerTextureManager::getFetchedTexture(pwater->GetDefaultOpaqueTextureAssetId()); + mOpaqueWaterImagep = LLViewerTextureManager::getFetchedTexture(opaqueTextureId); mOpaqueWaterImagep->addTextureStats(1024.f*1024.f); } |