aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authormingchen2007-07-16 01:25:16 +0000
committermingchen2007-07-16 01:25:16 +0000
commit7f10179129d4b5ac4ae5c05ff8598f569b8e6412 (patch)
treeb5a6eac77699fd1857085aedcecf8732db7a0ebd /OpenSim/Region/Environment/Scenes
parentCouple of small changes to NPC test character. (diff)
downloadopensim-SC_OLD-7f10179129d4b5ac4ae5c05ff8598f569b8e6412.zip
opensim-SC_OLD-7f10179129d4b5ac4ae5c05ff8598f569b8e6412.tar.gz
opensim-SC_OLD-7f10179129d4b5ac4ae5c05ff8598f569b8e6412.tar.bz2
opensim-SC_OLD-7f10179129d4b5ac4ae5c05ff8598f569b8e6412.tar.xz
*Fixed bug that incorrectly tabulated 'others' prims on a parcel
*Added support for selected prims (does not yet support prims being sat on) *Added support for listing avatars with prims on parcel with their prim count
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs23
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs2
3 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 6431bc7..347625a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -341,6 +341,29 @@ namespace OpenSim.Region.Environment.Scenes
341 if (((SceneObject)ent).rootLocalID == primLocalID) 341 if (((SceneObject)ent).rootLocalID == primLocalID)
342 { 342 {
343 ((SceneObject)ent).GetProperites(remoteClient); 343 ((SceneObject)ent).GetProperites(remoteClient);
344 ((SceneObject)ent).isSelected = true;
345 this.ParcelManager.setPrimsTainted();
346 break;
347 }
348 }
349 }
350 }
351
352 /// <summary>
353 ///
354 /// </summary>
355 /// <param name="primLocalID"></param>
356 /// <param name="remoteClient"></param>
357 public void DeselectPrim(uint primLocalID, IClientAPI remoteClient)
358 {
359 foreach (EntityBase ent in Entities.Values)
360 {
361 if (ent is SceneObject)
362 {
363 if (((SceneObject)ent).rootLocalID == primLocalID)
364 {
365 ((SceneObject)ent).isSelected = false;
366 this.ParcelManager.setPrimsTainted();
344 break; 367 break;
345 } 368 }
346 } 369 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5e2e494..ba57115 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -537,6 +537,7 @@ namespace OpenSim.Region.Environment.Scenes
537 client.OnUpdatePrimTexture += this.UpdatePrimTexture; 537 client.OnUpdatePrimTexture += this.UpdatePrimTexture;
538 client.OnTeleportLocationRequest += this.RequestTeleportLocation; 538 client.OnTeleportLocationRequest += this.RequestTeleportLocation;
539 client.OnObjectSelect += this.SelectPrim; 539 client.OnObjectSelect += this.SelectPrim;
540 client.OnObjectDeselect += this.DeselectPrim;
540 client.OnGrapUpdate += this.MoveObject; 541 client.OnGrapUpdate += this.MoveObject;
541 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest; 542 client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
542 client.OnObjectDescription += this.PrimDescription; 543 client.OnObjectDescription += this.PrimDescription;
@@ -549,6 +550,8 @@ namespace OpenSim.Region.Environment.Scenes
549 client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest); 550 client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest);
550 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest); 551 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest);
551 client.OnParcelSelectObjects += new ParcelSelectObjects(m_parcelManager.handleParcelSelectObjectsRequest); 552 client.OnParcelSelectObjects += new ParcelSelectObjects(m_parcelManager.handleParcelSelectObjectsRequest);
553 client.OnParcelObjectOwnerRequest += new ParcelObjectOwnerRequest(m_parcelManager.handleParcelObjectOwnersRequest);
554
552 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); 555 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
553 556
554 } 557 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 8de7cdb..e615599 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -49,6 +49,8 @@ namespace OpenSim.Region.Environment.Scenes
49 49
50 private EventManager m_eventManager; 50 private EventManager m_eventManager;
51 51
52 public bool isSelected = false;
53
52 public LLUUID rootUUID 54 public LLUUID rootUUID
53 { 55 {
54 get 56 get