livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.

master
Cinder 2016-12-15 09:34:04 -06:00
parent c49330176f
commit 645301633f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -369,6 +369,7 @@ Cinder Roxley
STORM-2124
STORM-2127
STORM-2136
STORM-2144
Clara Young
Coaldust Numbers
VWR-1095

8
indra/newview/llpaneloutfitedit.cpp
View File

@ -1300,7 +1300,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)
@ -1320,8 +1320,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);
}