Skip to content
Snippets Groups Projects
Commit a6cda1ee authored by Cinder's avatar Cinder
Browse files

STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called...

STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.
parent e62444c0
Branches
Tags
No related merge requests found
......@@ -362,6 +362,7 @@ Cinder Roxley
STORM-2053
STORM-2113
STORM-2127
STORM-2144
Clara Young
Coaldust Numbers
VWR-1095
......
......@@ -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,7 +1305,9 @@ void LLPanelOutfitEdit::onOutfitChanging(bool started)
S32 delta = started ? indicator_delta : 0;
S32 right_border = status_panel->getRect().getWidth() - delta;
if (mCurrentOutfitName)
update_status_widget_rect(mCurrentOutfitName, right_border);
if (mStatus)
update_status_widget_rect(mStatus, right_border);
indicator->setVisible(started);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment