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/llsettingsvo.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/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index b16ba65c01..583adcb024 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -851,6 +851,7 @@ void LLSettingsVOWater::updateSettings() if (pwaterpool) { pwaterpool->setTransparentTextures(getTransparentTextureID(), getNextTransparentTextureID()); + pwaterpool->setOpaqueTexture(GetDefaultOpaqueTextureAssetId()); pwaterpool->setNormalMaps(getNormalMapID(), getNextNormalMapID()); } } |