From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/newview/llfloatersidepanelcontainer.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/newview/llfloatersidepanelcontainer.cpp (limited to 'indra/newview/llfloatersidepanelcontainer.cpp') diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp old mode 100755 new mode 100644 -- cgit v1.2.3 From 3ce373be1b4d19528ca5459ac80c61d48de57b12 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 4 Mar 2016 18:22:08 +0200 Subject: MAINT-5435 missing null check --- indra/newview/llfloatersidepanelcontainer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloatersidepanelcontainer.cpp') 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(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(); } } -- cgit v1.2.3