summaryrefslogtreecommitdiff
path: root/indra/newview/llnameeditor.cpp
diff options
context:
space:
mode:
authorBrad Linden <46733234+brad-linden@users.noreply.github.com>2024-05-06 15:44:19 -0700
committerGitHub <noreply@github.com>2024-05-06 15:44:19 -0700
commit84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch)
treeb91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llnameeditor.cpp
parent76101843c0d390c25a783f212eb1ea75e508ada4 (diff)
parent8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff)
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llnameeditor.cpp')
-rw-r--r--indra/newview/llnameeditor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp
index 055754f270..93bdf2a715 100644
--- a/indra/newview/llnameeditor.cpp
+++ b/indra/newview/llnameeditor.cpp
@@ -58,7 +58,7 @@ LLNameEditor::~LLNameEditor()
LLNameEditor::sInstances.erase(this);
}
-void LLNameEditor::setNameID(const LLUUID& name_id, BOOL is_group)
+void LLNameEditor::setNameID(const LLUUID& name_id, bool is_group)
{
mNameID = name_id;
@@ -100,7 +100,7 @@ void LLNameEditor::refreshAll(const LLUUID& id, const std::string& full_name, bo
void LLNameEditor::setValue( const LLSD& value )
{
- setNameID(value.asUUID(), FALSE);
+ setNameID(value.asUUID(), false);
}
LLSD LLNameEditor::getValue() const