From a6cda1ee06ee422d39b8bc9ba9369e14ec3f1251 Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Thu, 15 Dec 2016 09:34:04 -0600
Subject: [PATCH] STORM-2144 - Guard against null pointers when
LLPanelOutfitEdit gets called before postBuild() on login.
---
doc/contributions.txt | 1 +
indra/newview/llpaneloutfitedit.cpp | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index eb012ee3184..e4b24b3abed 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -362,6 +362,7 @@ Cinder Roxley
STORM-2053
STORM-2113
STORM-2127
+ STORM-2144
Clara Young
Coaldust Numbers
VWR-1095
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 3f6bdde1276..5973b08183d 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -1285,7 +1285,7 @@ void LLPanelOutfitEdit::showFilteredWearablesListView(LLWearableType::EType type
showWearablesListView();
//e_list_view_item_type implicitly contains LLWearableType::EType starting from LVIT_SHAPE
- applyListViewFilter((EListViewItemType) (LVIT_SHAPE + type));
+ applyListViewFilter(static_cast<EListViewItemType>(LVIT_SHAPE + type));
}
static void update_status_widget_rect(LLView * widget, S32 right_border)
@@ -1305,8 +1305,10 @@ void LLPanelOutfitEdit::onOutfitChanging(bool started)
S32 delta = started ? indicator_delta : 0;
S32 right_border = status_panel->getRect().getWidth() - delta;
- update_status_widget_rect(mCurrentOutfitName, right_border);
- update_status_widget_rect(mStatus, right_border);
+ if (mCurrentOutfitName)
+ update_status_widget_rect(mCurrentOutfitName, right_border);
+ if (mStatus)
+ update_status_widget_rect(mStatus, right_border);
indicator->setVisible(started);
}
--
GitLab