Applied fix for crash when item just added to the inventory is renamed, ported from Phoenix, patch by Henri Beauchamp and Ansariel Hiller

2 files changed, 10 insertions, 4 deletions

diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 0e06353..5f06b88 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -165,10 +165,9 @@ void LLViewerInventoryItem::updateServer(BOOL is_new) const
 {
         if(!mIsComplete)
         {
-                // *FIX: deal with this better.
-                // If we're crashing here then the UI is incorrectly enabled.
-                llerrs << "LLViewerInventoryItem::updateServer() - for incomplete item"
-                           << llendl;
+                llwarns << "LLViewerInventoryItem::updateServer() - for incomplete item"
+                                << llendl;
+                LLNotifications::instance().add("IncompleteInventoryItem");
                 return;
         }
         if(gAgent.getID() != mPermissions.getOwner())
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index d9b415e..439b102 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7233,6 +7233,13 @@ You have entered an invalid password! Please try again.
 </notification>
   
 <notification
+   icon="notifytip.tga"
+   name="IncompleteInventoryItem"
+   type="notifytip">
+The item you are accessing is not yet locally available. Please try again in a minute.
+</notification>
+  
+<notification
  icon="alert.tga"
  name="ShowLookAtInfo"
  type="alert">