From fda39084e2baff093d6b520c3ab30375e734bb3c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 21 Jun 2010 05:38:13 -0700
Subject: Fixed #357: Crash in LLPanelPlace::onClickTeleport

---
 linden/indra/newview/llpanelplace.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index 300cd79..6b0455e 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -416,7 +416,10 @@ void LLPanelPlace::onClickTeleport(void* data)
 		parent_floaterp->close();
 	}
 	// LLFloater* parent_floaterp = (LLFloater*)self->getParent();
-	parent_viewp->setVisible(false);
+	if (parent_viewp)
+	{
+		parent_viewp->setVisible(false);
+	}
 	if(self->mLandmarkAssetID.notNull())
 	{
 		gAgent.teleportViaLandmark(self->mLandmarkAssetID);
-- 
cgit v1.1