diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llnamebox.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llnamebox.cpp')
| -rw-r--r-- | indra/newview/llnamebox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp index 8d32fb1d5c..33eb20ae11 100644 --- a/indra/newview/llnamebox.cpp +++ b/indra/newview/llnamebox.cpp @@ -59,12 +59,12 @@ LLNameBox::~LLNameBox() LLNameBox::sInstances.erase(this); } -void LLNameBox::setNameID(const LLUUID& name_id, BOOL is_group) +void LLNameBox::setNameID(const LLUUID& name_id, bool is_group) { mNameID = name_id; std::string name; - BOOL got_name = FALSE; + bool got_name = false; if (!is_group) { @@ -105,7 +105,7 @@ void LLNameBox::refreshAll(const LLUUID& id, const std::string& full_name, bool } } -void LLNameBox::setName(const std::string& name, BOOL is_group) +void LLNameBox::setName(const std::string& name, bool is_group) { if (mLink) { |