From 397ab96200b87c1dbf06c56cdbffb382ae67b18b Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Tue, 22 Feb 2011 19:47:52 -0600 Subject: [PATCH] Fix crash when item just added to inventory is renamed. From Henri Beauchamp, adapted to Phoenix by Ansariel Hiller. From PHOE-2529. --- indra/newview/llviewerinventory.cpp | 3 ++- indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 382cd8de6c..4a15ebb156 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -323,8 +323,9 @@ void LLViewerInventoryItem::updateServer(BOOL is_new) const { // *FIX: deal with this better. // If we're crashing here then the UI is incorrectly enabled. - llerrs << "LLViewerInventoryItem::updateServer() - for incomplete item" + llwarns << "LLViewerInventoryItem::updateServer() - for incomplete item" << llendl; + LLNotificationsUtil::add("IncompleteInventoryItem"); return; } if(gAgent.getID() != mPermissions.getOwner()) diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index b6d5d5d29d..6f30fc10a0 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4767,6 +4767,13 @@ Unable to load the script. Please try again. Some of the contents are you trying to share cannot be given/transferred just yet. Please try offering these items again in a bit. + +The item you are accessing is not yet locally available. Please try again in a minute. + +