aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs18
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
461 client.OnRequestMapBlocks += this.RequestMapBlocks; 461 client.OnRequestMapBlocks += this.RequestMapBlocks;
462 client.OnTeleportLocationRequest += this.RequestTeleportLocation; 462 client.OnTeleportLocationRequest += this.RequestTeleportLocation;
463 client.OnObjectSelect += this.SelectPrim; 463 client.OnObjectSelect += this.SelectPrim;
464 // client.OnGrapUpdate += this.MoveObject; 464 client.OnGrapUpdate += this.MoveObject;
465 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest; 465 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
466 client.OnObjectDescription += this.PrimDescription; 466 client.OnObjectDescription += this.PrimDescription;
467 client.OnObjectName += this.PrimName; 467 client.OnObjectName += this.PrimName;
468 client.OnLinkObjects += this.LinkObjects;
468 469
469 /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); 470 /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
470 remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); 471 remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@@ -585,6 +586,21 @@ namespace OpenSim.Region.Environment.Scenes
585 #endregion 586 #endregion
586 587
587 588
589 /// <summary>
590 ///
591 /// </summary>
592 /// <param name="entID"></param>
593 /// <returns></returns>
594 public bool DeleteEntity(LLUUID entID)
595 {
596 if (this.Entities.ContainsKey(entID))
597 {
598 this.Entities.Remove(entID);
599 return true;
600 }
601 return false;
602 }
603
588 #region RegionCommsHost 604 #region RegionCommsHost
589 605
590 /// <summary> 606 /// <summary>