aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-06 08:19:18 +0000
committerMelanie Thielker2008-10-06 08:19:18 +0000
commitd834996bbef445565ac17a3e1eb4fe9c491cad5b (patch)
tree966f6f242b45749f40599e376bce5d8dc915a83b /OpenSim/Region/Environment
parentExclude attachments from parcel prim counts (diff)
downloadopensim-SC_OLD-d834996bbef445565ac17a3e1eb4fe9c491cad5b.zip
opensim-SC_OLD-d834996bbef445565ac17a3e1eb4fe9c491cad5b.tar.gz
opensim-SC_OLD-d834996bbef445565ac17a3e1eb4fe9c491cad5b.tar.bz2
opensim-SC_OLD-d834996bbef445565ac17a3e1eb4fe9c491cad5b.tar.xz
Implement Parcel -> ForceOwnerToMe god mode packet
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs15
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs1
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 77a31c7..253eec6 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -103,6 +103,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
103 client.OnParcelAccessListRequest += new ParcelAccessListRequest(handleParcelAccessRequest); 103 client.OnParcelAccessListRequest += new ParcelAccessListRequest(handleParcelAccessRequest);
104 client.OnParcelAccessListUpdateRequest += new ParcelAccessListUpdateRequest(handleParcelAccessUpdateRequest); 104 client.OnParcelAccessListUpdateRequest += new ParcelAccessListUpdateRequest(handleParcelAccessUpdateRequest);
105 client.OnParcelAbandonRequest += new ParcelAbandonRequest(handleParcelAbandonRequest); 105 client.OnParcelAbandonRequest += new ParcelAbandonRequest(handleParcelAbandonRequest);
106 client.OnParcelGodForceOwner += new ParcelGodForceOwner(handleParcelGodForceOwner);
106 client.OnParcelReclaim += new ParcelReclaim(handleParcelReclaim); 107 client.OnParcelReclaim += new ParcelReclaim(handleParcelReclaim);
107 client.OnParcelInfoRequest += new ParcelInfoRequest(handleParcelInfo); 108 client.OnParcelInfoRequest += new ParcelInfoRequest(handleParcelInfo);
108 if (m_scene.Entities.ContainsKey(client.AgentId)) 109 if (m_scene.Entities.ContainsKey(client.AgentId))
@@ -912,6 +913,20 @@ namespace OpenSim.Region.Environment.Modules.World.Land
912 } 913 }
913 } 914 }
914 915
916 public void handleParcelGodForceOwner(int local_id, UUID ownerID, IClientAPI remote_client)
917 {
918 if (landList.ContainsKey(local_id))
919 {
920 if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remote_client.AgentId))
921 {
922 landList[local_id].landData.OwnerID = ownerID;
923
924 m_scene.Broadcast(SendParcelOverlay);
925 landList[local_id].sendLandUpdateToClient(remote_client);
926 }
927 }
928 }
929
915 public void handleParcelAbandonRequest(int local_id, IClientAPI remote_client) 930 public void handleParcelAbandonRequest(int local_id, IClientAPI remote_client)
916 { 931 {
917 if (landList.ContainsKey(local_id)) 932 if (landList.ContainsKey(local_id))
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 972491d..a236ccd 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -258,6 +258,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
258 public event ParcelJoinRequest OnParcelJoinRequest; 258 public event ParcelJoinRequest OnParcelJoinRequest;
259 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; 259 public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
260 public event ParcelAbandonRequest OnParcelAbandonRequest; 260 public event ParcelAbandonRequest OnParcelAbandonRequest;
261 public event ParcelGodForceOwner OnParcelGodForceOwner;
261 public event ParcelReclaim OnParcelReclaim; 262 public event ParcelReclaim OnParcelReclaim;
262 public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest; 263 public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
263 public event ParcelAccessListRequest OnParcelAccessListRequest; 264 public event ParcelAccessListRequest OnParcelAccessListRequest;