diff options
| author | callum_linden <none@none> | 2016-05-23 16:50:56 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-23 16:50:56 -0700 |
| commit | 05fcb7c8126a3f3496d948affe7f2722c9ca8fad (patch) | |
| tree | 159e542492c5c1fab1a04ef8a29b22fd60e4766a /indra/newview/llsidepanelappearance.cpp | |
| parent | 50ab1e57ec21f2009013b3bc061047887cdd07d5 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rw-r--r--[-rwxr-xr-x] | 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 100755..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; |