From 531f64a53bbd084dd8d0b33ae6c49821c74d718a Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 16 Aug 2007 16:31:32 +0000
Subject: Taking Prims (SceneObjectGroups) in and out of inventory should now
 work and if left in inventory will still be there after restarts. (as with
 the rest of inventory it will only fully work in standalone mode with account
 authentication turned on).

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 378acf9..96bb97a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -538,7 +538,10 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void AddEntity(SceneObjectGroup sceneObject)
         {
-            Entities.Add(sceneObject.UUID, sceneObject);
+            if(!Entities.ContainsKey(sceneObject.UUID))
+            {
+                Entities.Add(sceneObject.UUID, sceneObject);
+            }
         }
 
         public void RemoveEntity(SceneObjectGroup sceneObject)
@@ -604,6 +607,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnObjectDeselect += DeselectPrim;
             client.OnGrabUpdate += MoveObject;
             client.OnDeRezObject += DeRezObject;
+            client.OnRezObject += RezObject;
             client.OnNameFromUUIDRequest += commsManager.HandleUUIDNameRequest;
             client.OnObjectDescription += PrimDescription;
             client.OnObjectName += PrimName;
@@ -1114,7 +1118,7 @@ namespace OpenSim.Region.Environment.Scenes
                         this.assetCache.AddAsset(asset);
 
                         item.assetID = asset.FullID;
-                        userInfo.updateItem(remoteClient.AgentId, item);
+                        userInfo.UpdateItem(remoteClient.AgentId, item);
 
                        // remoteClient.SendInventoryItemUpdate(item);
 
-- 
cgit v1.1