From 5506dca9b9378168ea044d43b3a5c831b5fc35f7 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 15 Jun 2011 18:39:10 +0300
Subject: STORM-1339 FIXED Making a preventive fix for a crash in
 LLPanelPlaces::onTeleportButtonClicked().

---
 indra/newview/llpanelplaces.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/llpanelplaces.cpp')

diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 46262832dc..1e510a2d7b 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -584,6 +584,13 @@ void LLPanelPlaces::onTeleportButtonClicked()
 	{
 		if (mPlaceInfoType == LANDMARK_INFO_TYPE)
 		{
+			if (mItem.isNull())
+			{
+				llwarns << "NULL landmark item" << llendl;
+				llassert(mItem.notNull());
+				return;
+			}
+
 			LLSD payload;
 			payload["asset_id"] = mItem->getAssetUUID();
 			LLSD args; 
-- 
cgit v1.2.3