merge

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index aee20ff706..c7218ad9d5 100755
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -69,7 +69,11 @@ void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
 			LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
 			if ( panel_appearance )
 			{
-				panel_appearance->getWearable()->onClose();
+				LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();
+				if (edit_wearable_ptr)
+				{
+					edit_wearable_ptr->onClose();
+				}
 				panel_appearance->showOutfitsInventoryPanel();
 			}
 		}