This enables return from the parcel object owner display.

There's some oddness with the parcel counts, but if you can get past the oddness, you can return objects under an owner that you have permission to return.

1 files changed, 29 insertions, 22 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index a284ba5..850962d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1690,31 +1690,32 @@ namespace OpenSim.Region.Environment.Scenes
             //returnstring += "</scene>\n";
             
 
-            CachedUserInfo userInfo =
-                CommsManager.UserProfileCacheService.GetUserDetails(AgentId);
-            if (userInfo != null)
-            {
-                LLUUID folderID = LLUUID.Zero;
-                
-                List<InventoryFolderBase> subrootfolders = userInfo.RootFolder.RequestListOfFolders();
-                foreach (InventoryFolderBase flder in subrootfolders)
-                {
-                    if (flder.Name == "Lost And Found")
-                    {
-                        folderID = flder.ID;
-                        break;
-                    }
-                }
-
-                if (folderID == LLUUID.Zero)
-                {
-                    folderID = userInfo.RootFolder.ID;
-                }
+            
 
                 bool permissionToDelete = false;
 
                 for (int i = 0; i < returnobjects.Length; i++)
                 {
+                    CachedUserInfo userInfo =
+                        CommsManager.UserProfileCacheService.GetUserDetails(returnobjects[i].OwnerID);
+                    if (userInfo != null)
+                    {
+                        LLUUID folderID = LLUUID.Zero;
+
+                        List<InventoryFolderBase> subrootfolders = userInfo.RootFolder.RequestListOfFolders();
+                        foreach (InventoryFolderBase flder in subrootfolders)
+                        {
+                            if (flder.Name == "Lost And Found")
+                            {
+                                folderID = flder.ID;
+                                break;
+                            }
+                        }
+
+                        if (folderID == LLUUID.Zero)
+                        {
+                            folderID = userInfo.RootFolder.ID;
+                        }
                     permissionToDelete = ExternalChecks.ExternalChecksCanDeleteObject(returnobjects[i].UUID, AgentId);
 
                     // If the user doesn't have permission, go on to the next one.
@@ -1732,7 +1733,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                     InventoryItemBase item = new InventoryItemBase();
                     item.Creator = returnobjects[i].RootPart.CreatorID;
-                    item.Owner = AgentId;
+                    item.Owner = returnobjects[i].OwnerID;
                     item.ID = LLUUID.Random();
                     item.AssetID = asset.FullID;
                     item.Description = asset.Description;
@@ -1768,7 +1769,13 @@ namespace OpenSim.Region.Environment.Scenes
                     // TODO: add the new fields (Flags, Sale info, etc)
 
                     userInfo.AddItem(item);
-                    
+
+                    ScenePresence notifyUser = GetScenePresence(item.Owner);
+                    if (notifyUser != null)
+                    {
+                        notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item);
+                    }
+
                     SceneObjectGroup ObjectDeleting = returnobjects[i];
                     
                     returnobjects[i] = null;