From 374077547226014f00a021756b8e9c357d017264 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 4 Jan 2010 06:16:04 +0000
Subject: When rezzing a no-copy object on a no-rez parcel, the object vanishes
 from inventory until relog. This patch corrects this and puts the item back
 into inventory.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 89ce4ae..3044017 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2052,6 +2052,13 @@ namespace OpenSim.Region.Framework.Scenes
                         group.Children.Count, remoteClient.AgentId, pos)
                         && !attachment)
                     {
+                        // The client operates in no fail mode. It will
+                        // have already removed the item from the folder
+                        // if it's no copy.
+                        // Put it back if it's not an attachment
+                        //
+                        if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
+                            remoteClient.SendBulkUpdateInventory(item);
                         return null;
                     }
 
-- 
cgit v1.1