Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp

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();
 }