diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:30:37 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-10 10:30:37 +0300 |
commit | 5af93ff0d53606db3dca727a8cd1b73d7c37d70b (patch) | |
tree | 2deaa98bcd99fd2860da758a92816c3bdb838acd /indra/llcommon/lldictionary.h | |
parent | a902138de15067a86a6aeb02fdabd094873da0b2 (diff) | |
parent | 0acee937f55e6d1a198be2549d5cb55a0403dd4d (diff) |
Merge pull request #1177 from secondlife/marchcat/c-merge
Release (Maint W) -> Maint C merge
Diffstat (limited to 'indra/llcommon/lldictionary.h')
-rw-r--r-- | indra/llcommon/lldictionary.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h index 5800ec5e5d..18664e340e 100644 --- a/indra/llcommon/lldictionary.h +++ b/indra/llcommon/lldictionary.h @@ -87,11 +87,10 @@ protected: } void addEntry(Index index, Entry *entry) { - if (lookup(index)) + if (!this->emplace(index, entry).second) { LL_ERRS() << "Dictionary entry already added (attempted to add duplicate entry)" << LL_ENDL; } - (*this)[index] = entry; } }; |