diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-18 15:13:52 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-18 15:13:52 -0700 |
| commit | 8d627de47874660b6781e24f801200f590cd084a (patch) | |
| tree | 54275be3ca57ea64fb1bcc0adbdd26267bf56ecd /indra/newview/llsettingsvo.cpp | |
| parent | 616b1e8ec1c14f04661a42c2c4cbf6410bdfac38 (diff) | |
| parent | c9b2759469cb090b76a7d602eb876659c305c7f3 (diff) | |
Merge
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()); } } |