diff options
| author | Cinder <cinder@sdf.org> | 2016-12-15 09:34:04 -0600 |
|---|---|---|
| committer | Cinder <cinder@sdf.org> | 2016-12-15 09:34:04 -0600 |
| commit | a6cda1ee06ee422d39b8bc9ba9369e14ec3f1251 (patch) | |
| tree | 409d9bf21d62e77141a0fd4697cb2e7c7ca1204d /indra | |
| parent | e62444c0e73e6d89ab6a11e1e03047c83fe756f9 (diff) | |
STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 3f6bdde127..5973b08183 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); } |