diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-05-06 10:28:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-05-06 10:28:42 -0400 |
| commit | 950c41d184b340a7a3370c2cbda5d1eed9a17b0b (patch) | |
| tree | 373912394af6834d7d56258becf46954244b8423 /indra/newview/llsidepanelappearance.cpp | |
| parent | 20198b750d02c769ab6845226f98ce6e5dd1f20b (diff) | |
| parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) | |
merge 4.0.4-release and MAINT-5974
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index ea7cf82674..86135ee6e8 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -198,7 +198,7 @@ void LLSidepanelAppearance::updateToVisibility(const LLSD &new_visibility) if (is_outfit_edit_visible || is_wearable_edit_visible) { - const LLViewerWearable *wearable_ptr = mEditWearable->getWearable(); + const LLViewerWearable *wearable_ptr = mEditWearable ? mEditWearable->getWearable() : NULL; if (!wearable_ptr) { LL_WARNS() << "Visibility change to invalid wearable" << LL_ENDL; |