diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-11-01 23:11:57 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-11-01 23:11:57 +0200 |
| commit | 39e08b34b10fa16f22a97caa426e034d7b2afc9d (patch) | |
| tree | a10181b44eb6a2062aa33ddea5064b43f491c860 /indra/newview/llenvironment.cpp | |
| parent | d4d5d4018d89ebb13e1c47c9bb500af17a64d1be (diff) | |
| parent | d0e07c770b978d57210a5403bc42cc48e700ef63 (diff) | |
Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 9a23702c38..a02f5e2c4d 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -3085,7 +3085,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; |