From 7615ec497e7b69c8eefbf8ef1a464eaa22e77bf1 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 4 Nov 2009 20:30:11 -0500
Subject: EXT-2216 : Task properties sidepanel EXT-2224 : Edit item then delete
 item -- edit panel still active EXT-2228 : Buy/Pay/Open buttons for Task
 sidepanel

--HG--
branch : avatar-pipeline
---
 indra/newview/llsidepaneliteminfo.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index d36ffc9a9c..9d2960fbed 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -151,8 +151,16 @@ void LLSidepanelItemInfo::refresh()
 		refreshFromItem(item);
 		updateVerbs();
 	}
+	else
+	{
+		if (getIsEditing())
+		{
+			setIsEditing(FALSE);
+			return;
+		}
+	}
 
-	if (!getIsEditing() || !item)
+	if (!getIsEditing())
 	{
 		const std::string no_item_names[]={
 			"LabelItemName",
-- 
cgit v1.3