summaryrefslogtreecommitdiff
path: root/indra/llui/llsearcheditor.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <118752495+marchcat@users.noreply.github.com>2025-12-03 22:28:01 +0200
committerGitHub <noreply@github.com>2025-12-03 22:28:01 +0200
commit189ffd46e0316e333bc850f69eb7ed57dd7829e7 (patch)
tree68fd14fac829ae5223919fa21d0ab580ad64af7b /indra/llui/llsearcheditor.cpp
parentb49400e0882a80dd2972a31cde2152ba979b2ce4 (diff)
parent1e1f96e8e406d9b56e7b9246b9999e92434656af (diff)
Merge pull request #5101 from secondlife/marchcat/devlinux-2601
Merge 26.01 into develop-linux
Diffstat (limited to 'indra/llui/llsearcheditor.cpp')
-rw-r--r--indra/llui/llsearcheditor.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index a0c1e9d0c0..244faf8fe9 100644
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -106,12 +106,12 @@ LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
LLSearchEditor::~LLSearchEditor()
{
- mKeystrokeCallback = NULL;
- mTextChangedCallback = NULL;
+ mKeystrokeCallback = nullptr;
+ mTextChangedCallback = nullptr;
setCommitOnFocusLost(false);
- mSearchButton = NULL;
- mClearButton = NULL;
+ mSearchButton = nullptr;
+ mClearButton = nullptr;
mSearchEditor->deleteAllChildren();
deleteAllChildren();
}