From bf062e3b5dbaba124cf5043ec69cd89a7fa5619f Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Mon, 6 May 2013 22:12:18 -0600
Subject: [PATCH] FIRE-10223: Blacklist crash fix when selecting a linked prim
 in an object

---
 indra/newview/llviewermenu.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 8d506883e9..38c366c7d2 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2746,7 +2746,7 @@ void derenderObject(bool permanent)
 		{
 			if (permanent)
 			{
-				std::string entry_name;
+				std::string entry_name = "";
 				std::string region_name;
 
 				if (objp->isAvatar())
@@ -2758,11 +2758,13 @@ void derenderObject(bool permanent)
 				else
 				{
 					LLSelectNode* nodep = select_mgr->getSelection()->getFirstRootNode();
-					if (!nodep->mName.empty())
+					if (nodep)
 					{
-						entry_name = nodep->mName;
+						if (!nodep->mName.empty())
+						{
+							entry_name = nodep->mName;
+						}
 					}
-
 					LLViewerRegion* region = objp->getRegion();
 					if (region)
 					{