diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-02-08 17:18:37 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-02-08 17:18:37 +0100 |
| commit | 77afc073c54d6d03b7a24276a08d1924372058d0 (patch) | |
| tree | 95f472eabe4407cca653af3a867808f32402551c /indra/newview/llenvironment.cpp | |
| parent | 5805bbd8104e66fb9ae7ed3c22e374e377b2f2e1 (diff) | |
| parent | 4df2c0b8d67af267d3c9c6d58d63df3ed063a89e (diff) | |
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 4ef14c20f7..05c7decfbd 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -684,7 +684,6 @@ namespace if (!injection->mBlendIn) mix = 1.0 - mix; stringset_t dummy; - LLUUID cloud_noise_id = getCloudNoiseTextureId(); F64 value = this->mSettings[injection->mKeyName].asReal(); if (this->getCloudNoiseTextureId().isNull()) { @@ -3097,7 +3096,7 @@ bool LLEnvironment::loadFromSettings() LL_INFOS("ENVIRONMENT") << "Unable to open previous session environment file " << user_filepath << LL_ENDL; } - if (!env_data.isMap() || env_data.emptyMap()) + if (!env_data.isMap() || (env_data.size() == 0)) { LL_DEBUGS("ENVIRONMENT") << "Empty map loaded from: " << user_filepath << LL_ENDL; return false; |