From 747c9b9b9d883b7f15d7627f152d6195c8fab9d6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 18 Sep 2016 11:37:24 +0200
Subject: [PATCH] FIRE-20109: Crash at start using Vintage skin

---
 indra/newview/llpanelmaininventory.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index f0664c78b9..fcb1cc5f73 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1560,7 +1560,14 @@ void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )
 		{
 			menu->setVisible(FALSE);
 		}
-		getActivePanel()->getRootFolder()->finishRenamingItem();
+		// <FS:Ansariel> FIRE-20109: Crash at start using Vintage skin
+		//getActivePanel()->getRootFolder()->finishRenamingItem();
+		LLInventoryPanel* panel = getActivePanel();
+		if (panel)
+		{
+			panel->getRootFolder()->finishRenamingItem();
+		}
+		// </FS:Ansariel>
 	}
 }