From bf2aad17ac9fba1da60c209f81b8659ee4649bd0 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 10 Feb 2010 17:19:38 +0000
Subject: CID-421

Checker: NULL_RETURNS
Function: LLPanelPlaces::showAddedLandmarkInfo(const std::vector<LLUUID, std::allocator<LLUUID>> &)
File: /indra/newview/llpanelplaces.cpp
---
 indra/newview/llpanelplaces.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index c0491cc00f..17a970cfcf 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -1015,7 +1015,8 @@ void LLPanelPlaces::showAddedLandmarkInfo(const std::vector<LLUUID>& items)
 
 		LLInventoryItem* item = gInventory.getItem(item_id);
 
-		if (LLAssetType::AT_LANDMARK == item->getType())
+		llassert(item);
+		if (item && (LLAssetType::AT_LANDMARK == item->getType()) )
 		{
 			// Created landmark is passed to Places panel to allow its editing.
 			// If the panel is closed we don't reopen it until created landmark is loaded.
-- 
cgit v1.2.3