Merge pull request #5020 from secondlife/marchcat/slua-linux

develop-linux → SLua PV merge

1 files changed, 18 insertions, 18 deletions

diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 56ab6e9bae..785dc85448 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -99,8 +99,8 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p)
     mWrap(p.wrap),
     mNeedsLayout(false),
     mModified(false),
-    mButtonPanel(NULL),
-    mCenteringStack(NULL),
+    mButtonPanel(nullptr),
+    mCenteringStack(nullptr),
     mPadLeft(p.pad_left),
     mPadRight(p.pad_right),
     mPadTop(p.pad_top),
@@ -108,17 +108,17 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p)
     mPadBetween(p.pad_between),
     mMinGirth(p.min_girth),
     mPopupMenuHandle(),
-    mRightMouseTargetButton(NULL),
-    mStartDragItemCallback(NULL),
-    mHandleDragItemCallback(NULL),
-    mHandleDropCallback(NULL),
-    mButtonAddSignal(NULL),
-    mButtonEnterSignal(NULL),
-    mButtonLeaveSignal(NULL),
-    mButtonRemoveSignal(NULL),
+    mRightMouseTargetButton(nullptr),
+    mStartDragItemCallback(nullptr),
+    mHandleDragItemCallback(nullptr),
+    mHandleDropCallback(nullptr),
+    mButtonAddSignal(nullptr),
+    mButtonEnterSignal(nullptr),
+    mButtonLeaveSignal(nullptr),
+    mButtonRemoveSignal(nullptr),
     mDragAndDropTarget(false),
-    mCaretIcon(NULL),
-    mCenterPanel(NULL)
+    mCaretIcon(nullptr),
+    mCenterPanel(nullptr)
 {
     mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_WITH_TEXT] = p.button_icon_and_text;
     mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_ONLY] = p.button_icon;
@@ -1097,12 +1097,12 @@ LLToolBarButton::LLToolBarButton(const Params& p)
     mWidthRange(p.button_width),
     mDesiredHeight(p.desired_height),
     mId(""),
-    mIsEnabledSignal(NULL),
-    mIsRunningSignal(NULL),
-    mIsStartingSignal(NULL),
+    mIsEnabledSignal(nullptr),
+    mIsRunningSignal(nullptr),
+    mIsStartingSignal(nullptr),
     mIsDragged(false),
-    mStartDragItemCallback(NULL),
-    mHandleDragItemCallback(NULL),
+    mStartDragItemCallback(nullptr),
+    mHandleDragItemCallback(nullptr),
     mOriginalImageSelected(p.image_selected),
     mOriginalImageUnselected(p.image_unselected),
     mOriginalImagePressed(p.image_pressed),
@@ -1256,7 +1256,7 @@ void LLToolBar::LLCenterLayoutPanel::handleReshape(const LLRect& rect, bool by_u
 {
     LLLayoutPanel::handleReshape(rect, by_user);
 
-    if (!mReshapeCallback.empty())
+    if (mReshapeCallback != nullptr)
     {
         LLRect r;
         localRectToOtherView(mButtonPanel->getRect(), &r, gFloaterView);