diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-19 15:57:20 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-19 15:57:20 +0000 |
| commit | 8b7b22d236ff5fde6b1f031663af61a542c44f64 (patch) | |
| tree | 6025a3b89db37b2c684d04070da6298850246e66 /indra/newview | |
| parent | ab9a66d5fe8a85f741cc0597be01586bd55704b0 (diff) | |
| parent | 722a00cb0ba4c0e473a53720cd087f56ff5f1aeb (diff) | |
Merged in maxim_productengine/viewer-eep2 (pull request #159)
SL-9918 FIXED [EEP] Cloud image set to None displays the same clouds as Default
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvosky.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index 7564a5003b..9790a1c592 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -952,11 +952,10 @@ void LLVOSky::setCloudNoiseTextures(const LLUUID& cloud_noise_texture, const LLU { LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky(); - LLUUID cloud_noise_tex = cloud_noise_texture.isNull() ? psky->GetDefaultCloudNoiseTextureId() : cloud_noise_texture; - LLUUID cloud_noise_tex_next = cloud_noise_texture_next.isNull() ? (cloud_noise_texture.isNull() ? psky->GetDefaultCloudNoiseTextureId() : cloud_noise_texture) : cloud_noise_texture_next; + LLUUID cloud_noise_tex_next = cloud_noise_texture_next.isNull() ? (cloud_noise_texture.isNull() ? LLUUID() : cloud_noise_texture) : cloud_noise_texture_next; - mCloudNoiseTexturep[0] = LLViewerTextureManager::getFetchedTexture(cloud_noise_tex, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); - mCloudNoiseTexturep[1] = LLViewerTextureManager::getFetchedTexture(cloud_noise_tex_next, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); + mCloudNoiseTexturep[0] = cloud_noise_texture.isNull() ? nullptr : LLViewerTextureManager::getFetchedTexture(cloud_noise_texture, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); + mCloudNoiseTexturep[1] = cloud_noise_tex_next.isNull() ? nullptr : LLViewerTextureManager::getFetchedTexture(cloud_noise_tex_next, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); if (mCloudNoiseTexturep[0]) { |