diff options
author | Brad Linden <brad@lindenlab.com> | 2024-08-09 17:57:23 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-08-09 17:57:23 -0700 |
commit | a7fde9d79c517bfc6165756c1bc3eb16fa4d935c (patch) | |
tree | f0608f7f72f23a447778f8bce6f210eb221ebdf1 /indra/llxml/llcontrol.cpp | |
parent | ac330f63fd7ac655bbd06ce5d4ed65430aa2f42a (diff) | |
parent | c106221726c48a4231b7854bff224ae422c0517f (diff) |
Merge remote-tracking branch release/2024.06-atlasaurus into 'develop'
Diffstat (limited to 'indra/llxml/llcontrol.cpp')
-rw-r--r-- | indra/llxml/llcontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 82e07e03c9..bb590ebd76 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -348,7 +348,7 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(std::string_view name) incrCount(name); } - ctrl_name_table_t::iterator iter = mNameTable.find(name.data()); + ctrl_name_table_t::iterator iter = mNameTable.find(name); return iter == mNameTable.end() ? LLPointer<LLControlVariable>() : iter->second; } @@ -657,7 +657,7 @@ LLSD LLControlGroup::asLLSD(bool diffs_only) return result; } -bool LLControlGroup::controlExists(const std::string& name) +bool LLControlGroup::controlExists(std::string_view name) { ctrl_name_table_t::iterator iter = mNameTable.find(name); return iter != mNameTable.end(); |