More work on SceneObject/Primitive and building (Linking is a work in progress as is all). Committing now as I've finished for the night and will be continued tomorrow.

1 files changed, 17 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 08adc84..77058cc 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -461,10 +461,11 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnRequestMapBlocks += this.RequestMapBlocks;

             client.OnTeleportLocationRequest += this.RequestTeleportLocation;

             client.OnObjectSelect += this.SelectPrim;

-           // client.OnGrapUpdate += this.MoveObject;

+            client.OnGrapUpdate += this.MoveObject;

             client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;

             client.OnObjectDescription += this.PrimDescription;

             client.OnObjectName += this.PrimName;

+            client.OnLinkObjects += this.LinkObjects;

 

             /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);

             remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);

@@ -585,6 +586,21 @@ namespace OpenSim.Region.Environment.Scenes
         #endregion

 

 

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="entID"></param>

+        /// <returns></returns>

+        public bool DeleteEntity(LLUUID entID)

+        {

+            if (this.Entities.ContainsKey(entID))

+            {

+                this.Entities.Remove(entID);

+                return true;

+            }

+            return false;

+        }

+

         #region RegionCommsHost

 

         /// <summary>