diff options
author | dr scofield (aka dirk husemann) | 2009-09-02 11:00:31 +0200 |
---|---|---|
committer | dr scofield (aka dirk husemann) | 2009-09-02 11:06:18 +0200 |
commit | bb0cbdc0641559bcbe368be32a2e9fdb3c7615bb (patch) | |
tree | 40dcd435f6786e07ab9f2085692cde0e6acbf798 /OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |
parent | warnings safari. (diff) | |
download | opensim-SC_OLD-bb0cbdc0641559bcbe368be32a2e9fdb3c7615bb.zip opensim-SC_OLD-bb0cbdc0641559bcbe368be32a2e9fdb3c7615bb.tar.gz opensim-SC_OLD-bb0cbdc0641559bcbe368be32a2e9fdb3c7615bb.tar.bz2 opensim-SC_OLD-bb0cbdc0641559bcbe368be32a2e9fdb3c7615bb.tar.xz |
switching LandManagementModule to "new" region module scheme; cleaning
up method names in LandManagementModule (was a bit of a
mess). suppressing warnings re Constants.RegionSize.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 163 |
1 files changed, 91 insertions, 72 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 5c2e136..76ff6da 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
50 | public uint x, y; | 50 | public uint x, y; |
51 | } | 51 | } |
52 | 52 | ||
53 | public class LandManagementModule : IRegionModule | 53 | public class LandManagementModule : INonSharedRegionModule |
54 | { | 54 | { |
55 | private static readonly ILog m_log = | 55 | private static readonly ILog m_log = |
56 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 56 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -61,7 +61,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
61 | private Scene m_scene; | 61 | private Scene m_scene; |
62 | 62 | ||
63 | // Minimum for parcels to work is 64m even if we don't actually use them. | 63 | // Minimum for parcels to work is 64m even if we don't actually use them. |
64 | #pragma warning disable 0429 | ||
64 | private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; | 65 | private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; |
66 | #pragma warning restore 0429 | ||
65 | 67 | ||
66 | private readonly int[,] m_landIDList = new int[landArrayMax, landArrayMax]; | 68 | private readonly int[,] m_landIDList = new int[landArrayMax, landArrayMax]; |
67 | private readonly Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>(); | 69 | private readonly Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>(); |
@@ -74,9 +76,18 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
74 | // caches ExtendedLandData | 76 | // caches ExtendedLandData |
75 | private Cache parcelInfoCache; | 77 | private Cache parcelInfoCache; |
76 | 78 | ||
77 | #region IRegionModule Members | 79 | #region INonSharedRegionModule Members |
78 | 80 | ||
79 | public void Initialise(Scene scene, IConfigSource source) | 81 | public Type ReplaceableInterface |
82 | { | ||
83 | get { return null; } | ||
84 | } | ||
85 | |||
86 | public void Initialise(IConfigSource source) | ||
87 | { | ||
88 | } | ||
89 | |||
90 | public void AddRegion(Scene scene) | ||
80 | { | 91 | { |
81 | m_scene = scene; | 92 | m_scene = scene; |
82 | m_landIDList.Initialize(); | 93 | m_landIDList.Initialize(); |
@@ -86,22 +97,21 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
86 | parcelInfoCache.Size = 30; // the number of different parcel requests in this region to cache | 97 | parcelInfoCache.Size = 30; // the number of different parcel requests in this region to cache |
87 | parcelInfoCache.DefaultTTL = new TimeSpan(0, 5, 0); | 98 | parcelInfoCache.DefaultTTL = new TimeSpan(0, 5, 0); |
88 | 99 | ||
89 | m_scene.EventManager.OnParcelPrimCountAdd += AddPrimToLandPrimCounts; | 100 | m_scene.EventManager.OnParcelPrimCountAdd += EventManagerOnParcelPrimCountAdd; |
90 | m_scene.EventManager.OnParcelPrimCountUpdate += UpdateLandPrimCounts; | 101 | m_scene.EventManager.OnParcelPrimCountUpdate += EventManagerOnParcelPrimCountUpdate; |
91 | m_scene.EventManager.OnAvatarEnteringNewParcel += new EventManager.AvatarEnteringNewParcel(handleAvatarChangingParcel); | 102 | m_scene.EventManager.OnAvatarEnteringNewParcel += EventManagerOnAvatarEnteringNewParcel; |
92 | m_scene.EventManager.OnClientMovement += new EventManager.ClientMovement(handleAnyClientMovement); | 103 | m_scene.EventManager.OnClientMovement += EventManagerOnClientMovement; |
93 | m_scene.EventManager.OnValidateLandBuy += handleLandValidationRequest; | 104 | m_scene.EventManager.OnValidateLandBuy += EventManagerOnValidateLandBuy; |
94 | m_scene.EventManager.OnLandBuy += handleLandBuyRequest; | 105 | m_scene.EventManager.OnLandBuy += EventManagerOnLandBuy; |
95 | m_scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient); | 106 | m_scene.EventManager.OnNewClient += EventManagerOnNewClient; |
96 | m_scene.EventManager.OnSignificantClientMovement += handleSignificantClientMovement; | 107 | m_scene.EventManager.OnSignificantClientMovement += EventManagerOnSignificantClientMovement; |
97 | m_scene.EventManager.OnObjectBeingRemovedFromScene += RemovePrimFromLandPrimCounts; | 108 | m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene; |
98 | 109 | m_scene.EventManager.OnNoticeNoLandDataFromStorage += EventManagerOnNoLandDataFromStorage; | |
99 | m_scene.EventManager.OnNoticeNoLandDataFromStorage += this.NoLandDataFromStorage; | 110 | m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage; |
100 | m_scene.EventManager.OnIncomingLandDataFromStorage += this.IncomingLandObjectsFromStorage; | 111 | m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan; |
101 | m_scene.EventManager.OnSetAllowForcefulBan += this.SetAllowedForcefulBans; | 112 | m_scene.EventManager.OnRequestParcelPrimCountUpdate += EventManagerOnRequestParcelPrimCountUpdate; |
102 | m_scene.EventManager.OnRequestParcelPrimCountUpdate += this.PerformParcelPrimCountUpdate; | 113 | m_scene.EventManager.OnParcelPrimCountTainted += EventManagerOnParcelPrimCountTainted; |
103 | m_scene.EventManager.OnParcelPrimCountTainted += this.SetPrimsTainted; | 114 | m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps; |
104 | m_scene.EventManager.OnRegisterCaps += this.OnRegisterCaps; | ||
105 | 115 | ||
106 | lock (m_scene) | 116 | lock (m_scene) |
107 | { | 117 | { |
@@ -109,24 +119,31 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
109 | } | 119 | } |
110 | } | 120 | } |
111 | 121 | ||
112 | void EventManager_OnNewClient(IClientAPI client) | 122 | public void RegionLoaded(Scene scene) |
123 | { | ||
124 | } | ||
125 | |||
126 | public void RemoveRegion(Scene scene) | ||
127 | { | ||
128 | } | ||
129 | |||
130 | void EventManagerOnNewClient(IClientAPI client) | ||
113 | { | 131 | { |
114 | //Register some client events | 132 | //Register some client events |
115 | client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(handleParcelPropertiesRequest); | 133 | client.OnParcelPropertiesRequest += ClientOnParcelPropertiesRequest; |
116 | client.OnParcelDivideRequest += new ParcelDivideRequest(handleParcelDivideRequest); | 134 | client.OnParcelDivideRequest += ClientOnParcelDivideRequest; |
117 | client.OnParcelJoinRequest += new ParcelJoinRequest(handleParcelJoinRequest); | 135 | client.OnParcelJoinRequest += ClientOnParcelJoinRequest; |
118 | client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(handleParcelPropertiesUpdateRequest); | 136 | client.OnParcelPropertiesUpdateRequest += ClientOnParcelPropertiesUpdateRequest; |
119 | client.OnParcelSelectObjects += new ParcelSelectObjects(handleParcelSelectObjectsRequest); | 137 | client.OnParcelSelectObjects += ClientOnParcelSelectObjects; |
120 | client.OnParcelObjectOwnerRequest += new ParcelObjectOwnerRequest(handleParcelObjectOwnersRequest); | 138 | client.OnParcelObjectOwnerRequest += ClientOnParcelObjectOwnerRequest; |
121 | client.OnParcelAccessListRequest += new ParcelAccessListRequest(handleParcelAccessRequest); | 139 | client.OnParcelAccessListRequest += ClientOnParcelAccessListRequest; |
122 | client.OnParcelAccessListUpdateRequest += new ParcelAccessListUpdateRequest(handleParcelAccessUpdateRequest); | 140 | client.OnParcelAccessListUpdateRequest += ClientOnParcelAccessUpdateListRequest; |
123 | client.OnParcelAbandonRequest += new ParcelAbandonRequest(handleParcelAbandonRequest); | 141 | client.OnParcelAbandonRequest += ClientOnParcelAbandonRequest; |
124 | client.OnParcelGodForceOwner += new ParcelGodForceOwner(handleParcelGodForceOwner); | 142 | client.OnParcelGodForceOwner += ClientOnParcelGodForceOwner; |
125 | client.OnParcelReclaim += new ParcelReclaim(handleParcelReclaim); | 143 | client.OnParcelReclaim += ClientOnParcelReclaim; |
126 | client.OnParcelInfoRequest += new ParcelInfoRequest(handleParcelInfo); | 144 | client.OnParcelInfoRequest += ClientOnParcelInfoRequest; |
127 | client.OnParcelDwellRequest += new ParcelDwellRequest(handleParcelDwell); | 145 | client.OnParcelDwellRequest += ClientOnParcelDwellRequest; |
128 | 146 | client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; | |
129 | client.OnParcelDeedToGroup += new ParcelDeedToGroup(handleParcelDeedToGroup); | ||
130 | 147 | ||
131 | if (m_scene.Entities.ContainsKey(client.AgentId)) | 148 | if (m_scene.Entities.ContainsKey(client.AgentId)) |
132 | { | 149 | { |
@@ -158,7 +175,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
158 | 175 | ||
159 | #region Parcel Add/Remove/Get/Create | 176 | #region Parcel Add/Remove/Get/Create |
160 | 177 | ||
161 | public void SetAllowedForcefulBans(bool forceful) | 178 | public void EventManagerOnSetAllowedForcefulBan(bool forceful) |
162 | { | 179 | { |
163 | AllowedForcefulBans = forceful; | 180 | AllowedForcefulBans = forceful; |
164 | } | 181 | } |
@@ -256,7 +273,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
256 | } | 273 | } |
257 | } | 274 | } |
258 | 275 | ||
259 | public void handleAvatarChangingParcel(ScenePresence avatar, int localLandID, UUID regionID) | 276 | public void EventManagerOnAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID) |
260 | { | 277 | { |
261 | if (m_scene.RegionInfo.RegionID == regionID) | 278 | if (m_scene.RegionInfo.RegionID == regionID) |
262 | { | 279 | { |
@@ -353,7 +370,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
353 | SendLandUpdate(avatar, false); | 370 | SendLandUpdate(avatar, false); |
354 | } | 371 | } |
355 | 372 | ||
356 | public void handleSignificantClientMovement(IClientAPI remote_client) | 373 | public void EventManagerOnSignificantClientMovement(IClientAPI remote_client) |
357 | { | 374 | { |
358 | ScenePresence clientAvatar = m_scene.GetScenePresence(remote_client.AgentId); | 375 | ScenePresence clientAvatar = m_scene.GetScenePresence(remote_client.AgentId); |
359 | 376 | ||
@@ -367,8 +384,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
367 | if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT && | 384 | if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT && |
368 | clientAvatar.sentMessageAboutRestrictedParcelFlyingDown) | 385 | clientAvatar.sentMessageAboutRestrictedParcelFlyingDown) |
369 | { | 386 | { |
370 | handleAvatarChangingParcel(clientAvatar, parcel.landData.LocalID, m_scene.RegionInfo.RegionID); | 387 | EventManagerOnAvatarEnteringNewParcel(clientAvatar, parcel.landData.LocalID, |
371 | //They are going below the safety line! | 388 | m_scene.RegionInfo.RegionID); |
389 | //They are going under the safety line! | ||
372 | if (!parcel.isBannedFromLand(clientAvatar.UUID)) | 390 | if (!parcel.isBannedFromLand(clientAvatar.UUID)) |
373 | { | 391 | { |
374 | clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false; | 392 | clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false; |
@@ -383,8 +401,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
383 | } | 401 | } |
384 | } | 402 | } |
385 | 403 | ||
386 | public void handleAnyClientMovement(ScenePresence avatar) | 404 | public void EventManagerOnClientMovement(ScenePresence avatar) |
387 | //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. | 405 | //Like handleEventManagerOnSignificantClientMovement, but called with an AgentUpdate regardless of distance. |
388 | { | 406 | { |
389 | ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 407 | ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
390 | if (over != null) | 408 | if (over != null) |
@@ -398,8 +416,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
398 | } | 416 | } |
399 | 417 | ||
400 | 418 | ||
401 | public void handleParcelAccessRequest(UUID agentID, UUID sessionID, uint flags, int sequenceID, | 419 | public void ClientOnParcelAccessListRequest(UUID agentID, UUID sessionID, uint flags, int sequenceID, |
402 | int landLocalID, IClientAPI remote_client) | 420 | int landLocalID, IClientAPI remote_client) |
403 | { | 421 | { |
404 | ILandObject land; | 422 | ILandObject land; |
405 | lock (m_landList) | 423 | lock (m_landList) |
@@ -413,9 +431,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
413 | } | 431 | } |
414 | } | 432 | } |
415 | 433 | ||
416 | public void handleParcelAccessUpdateRequest(UUID agentID, UUID sessionID, uint flags, int landLocalID, | 434 | public void ClientOnParcelAccessUpdateListRequest(UUID agentID, UUID sessionID, uint flags, int landLocalID, |
417 | List<ParcelManager.ParcelAccessEntry> entries, | 435 | List<ParcelManager.ParcelAccessEntry> entries, |
418 | IClientAPI remote_client) | 436 | IClientAPI remote_client) |
419 | { | 437 | { |
420 | ILandObject land; | 438 | ILandObject land; |
421 | lock (m_landList) | 439 | lock (m_landList) |
@@ -615,7 +633,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
615 | } | 633 | } |
616 | } | 634 | } |
617 | 635 | ||
618 | public void SetPrimsTainted() | 636 | public void EventManagerOnParcelPrimCountTainted() |
619 | { | 637 | { |
620 | m_landPrimCountTainted = true; | 638 | m_landPrimCountTainted = true; |
621 | } | 639 | } |
@@ -625,7 +643,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
625 | return m_landPrimCountTainted; | 643 | return m_landPrimCountTainted; |
626 | } | 644 | } |
627 | 645 | ||
628 | public void AddPrimToLandPrimCounts(SceneObjectGroup obj) | 646 | public void EventManagerOnParcelPrimCountAdd(SceneObjectGroup obj) |
629 | { | 647 | { |
630 | Vector3 position = obj.AbsolutePosition; | 648 | Vector3 position = obj.AbsolutePosition; |
631 | ILandObject landUnderPrim = GetLandObject(position.X, position.Y); | 649 | ILandObject landUnderPrim = GetLandObject(position.X, position.Y); |
@@ -635,7 +653,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
635 | } | 653 | } |
636 | } | 654 | } |
637 | 655 | ||
638 | public void RemovePrimFromLandPrimCounts(SceneObjectGroup obj) | 656 | public void EventManagerOnObjectBeingRemovedFromScene(SceneObjectGroup obj) |
639 | { | 657 | { |
640 | 658 | ||
641 | lock (m_landList) | 659 | lock (m_landList) |
@@ -687,7 +705,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
687 | } | 705 | } |
688 | } | 706 | } |
689 | 707 | ||
690 | public void UpdateLandPrimCounts() | 708 | public void EventManagerOnParcelPrimCountUpdate() |
691 | { | 709 | { |
692 | ResetAllLandPrimCounts(); | 710 | ResetAllLandPrimCounts(); |
693 | foreach (EntityBase obj in m_scene.Entities) | 711 | foreach (EntityBase obj in m_scene.Entities) |
@@ -704,7 +722,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
704 | m_landPrimCountTainted = false; | 722 | m_landPrimCountTainted = false; |
705 | } | 723 | } |
706 | 724 | ||
707 | public void PerformParcelPrimCountUpdate() | 725 | public void EventManagerOnRequestParcelPrimCountUpdate() |
708 | { | 726 | { |
709 | ResetAllLandPrimCounts(); | 727 | ResetAllLandPrimCounts(); |
710 | m_scene.EventManager.TriggerParcelPrimCountUpdate(); | 728 | m_scene.EventManager.TriggerParcelPrimCountUpdate(); |
@@ -773,7 +791,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
773 | m_landList[startLandObjectIndex].forceUpdateLandInfo(); | 791 | m_landList[startLandObjectIndex].forceUpdateLandInfo(); |
774 | } | 792 | } |
775 | 793 | ||
776 | SetPrimsTainted(); | 794 | EventManagerOnParcelPrimCountTainted(); |
777 | 795 | ||
778 | //Now add the new land object | 796 | //Now add the new land object |
779 | ILandObject result = AddLandObject(newLand); | 797 | ILandObject result = AddLandObject(newLand); |
@@ -841,7 +859,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
841 | performFinalLandJoin(masterLandObject, slaveLandObject); | 859 | performFinalLandJoin(masterLandObject, slaveLandObject); |
842 | } | 860 | } |
843 | } | 861 | } |
844 | SetPrimsTainted(); | 862 | EventManagerOnParcelPrimCountTainted(); |
845 | 863 | ||
846 | masterLandObject.sendLandUpdateToAvatarsOverMe(); | 864 | masterLandObject.sendLandUpdateToAvatarsOverMe(); |
847 | } | 865 | } |
@@ -942,8 +960,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
942 | } | 960 | } |
943 | } | 961 | } |
944 | 962 | ||
945 | public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, | 963 | public void ClientOnParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, |
946 | bool snap_selection, IClientAPI remote_client) | 964 | bool snap_selection, IClientAPI remote_client) |
947 | { | 965 | { |
948 | //Get the land objects within the bounds | 966 | //Get the land objects within the bounds |
949 | List<ILandObject> temp = new List<ILandObject>(); | 967 | List<ILandObject> temp = new List<ILandObject>(); |
@@ -982,7 +1000,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
982 | SendParcelOverlay(remote_client); | 1000 | SendParcelOverlay(remote_client); |
983 | } | 1001 | } |
984 | 1002 | ||
985 | public void handleParcelPropertiesUpdateRequest(LandUpdateArgs args, int localID, IClientAPI remote_client) | 1003 | public void ClientOnParcelPropertiesUpdateRequest(LandUpdateArgs args, int localID, IClientAPI remote_client) |
986 | { | 1004 | { |
987 | ILandObject land; | 1005 | ILandObject land; |
988 | lock (m_landList) | 1006 | lock (m_landList) |
@@ -993,22 +1011,23 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
993 | if (land != null) land.updateLandProperties(args, remote_client); | 1011 | if (land != null) land.updateLandProperties(args, remote_client); |
994 | } | 1012 | } |
995 | 1013 | ||
996 | public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client) | 1014 | public void ClientOnParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client) |
997 | { | 1015 | { |
998 | subdivide(west, south, east, north, remote_client.AgentId); | 1016 | subdivide(west, south, east, north, remote_client.AgentId); |
999 | } | 1017 | } |
1000 | 1018 | ||
1001 | public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client) | 1019 | public void ClientOnParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client) |
1002 | { | 1020 | { |
1003 | join(west, south, east, north, remote_client.AgentId); | 1021 | join(west, south, east, north, remote_client.AgentId); |
1004 | } | 1022 | } |
1005 | 1023 | ||
1006 | public void handleParcelSelectObjectsRequest(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client) | 1024 | public void ClientOnParcelSelectObjects(int local_id, int request_type, |
1025 | List<UUID> returnIDs, IClientAPI remote_client) | ||
1007 | { | 1026 | { |
1008 | m_landList[local_id].sendForceObjectSelect(local_id, request_type, returnIDs, remote_client); | 1027 | m_landList[local_id].sendForceObjectSelect(local_id, request_type, returnIDs, remote_client); |
1009 | } | 1028 | } |
1010 | 1029 | ||
1011 | public void handleParcelObjectOwnersRequest(int local_id, IClientAPI remote_client) | 1030 | public void ClientOnParcelObjectOwnerRequest(int local_id, IClientAPI remote_client) |
1012 | { | 1031 | { |
1013 | ILandObject land; | 1032 | ILandObject land; |
1014 | lock (m_landList) | 1033 | lock (m_landList) |
@@ -1026,7 +1045,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1026 | } | 1045 | } |
1027 | } | 1046 | } |
1028 | 1047 | ||
1029 | public void handleParcelGodForceOwner(int local_id, UUID ownerID, IClientAPI remote_client) | 1048 | public void ClientOnParcelGodForceOwner(int local_id, UUID ownerID, IClientAPI remote_client) |
1030 | { | 1049 | { |
1031 | ILandObject land; | 1050 | ILandObject land; |
1032 | lock (m_landList) | 1051 | lock (m_landList) |
@@ -1046,7 +1065,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1046 | } | 1065 | } |
1047 | } | 1066 | } |
1048 | 1067 | ||
1049 | public void handleParcelAbandonRequest(int local_id, IClientAPI remote_client) | 1068 | public void ClientOnParcelAbandonRequest(int local_id, IClientAPI remote_client) |
1050 | { | 1069 | { |
1051 | ILandObject land; | 1070 | ILandObject land; |
1052 | lock (m_landList) | 1071 | lock (m_landList) |
@@ -1068,7 +1087,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1068 | } | 1087 | } |
1069 | } | 1088 | } |
1070 | 1089 | ||
1071 | public void handleParcelReclaim(int local_id, IClientAPI remote_client) | 1090 | public void ClientOnParcelReclaim(int local_id, IClientAPI remote_client) |
1072 | { | 1091 | { |
1073 | ILandObject land; | 1092 | ILandObject land; |
1074 | lock (m_landList) | 1093 | lock (m_landList) |
@@ -1097,7 +1116,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1097 | // and land has been validated as well, this method transfers | 1116 | // and land has been validated as well, this method transfers |
1098 | // the land ownership | 1117 | // the land ownership |
1099 | 1118 | ||
1100 | public void handleLandBuyRequest(Object o, EventManager.LandBuyArgs e) | 1119 | public void EventManagerOnLandBuy(Object o, EventManager.LandBuyArgs e) |
1101 | { | 1120 | { |
1102 | if (e.economyValidated && e.landValidated) | 1121 | if (e.economyValidated && e.landValidated) |
1103 | { | 1122 | { |
@@ -1118,7 +1137,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1118 | // be validated. This method validates the right to buy the | 1137 | // be validated. This method validates the right to buy the |
1119 | // parcel | 1138 | // parcel |
1120 | 1139 | ||
1121 | public void handleLandValidationRequest(Object o, EventManager.LandBuyArgs e) | 1140 | public void EventManagerOnValidateLandBuy(Object o, EventManager.LandBuyArgs e) |
1122 | { | 1141 | { |
1123 | if (e.landValidated == false) | 1142 | if (e.landValidated == false) |
1124 | { | 1143 | { |
@@ -1150,7 +1169,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1150 | } | 1169 | } |
1151 | 1170 | ||
1152 | 1171 | ||
1153 | void handleParcelDeedToGroup(int parcelLocalID, UUID groupID, IClientAPI remote_client) | 1172 | void ClientOnParcelDeedToGroup(int parcelLocalID, UUID groupID, IClientAPI remote_client) |
1154 | { | 1173 | { |
1155 | ILandObject land; | 1174 | ILandObject land; |
1156 | lock (m_landList) | 1175 | lock (m_landList) |
@@ -1171,7 +1190,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1171 | 1190 | ||
1172 | #region Land Object From Storage Functions | 1191 | #region Land Object From Storage Functions |
1173 | 1192 | ||
1174 | public void IncomingLandObjectsFromStorage(List<LandData> data) | 1193 | public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data) |
1175 | { | 1194 | { |
1176 | for (int i = 0; i < data.Count; i++) | 1195 | for (int i = 0; i < data.Count; i++) |
1177 | { | 1196 | { |
@@ -1200,7 +1219,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1200 | selectedParcel.returnLandObjects(returnType, agentIDs, taskIDs, remoteClient); | 1219 | selectedParcel.returnLandObjects(returnType, agentIDs, taskIDs, remoteClient); |
1201 | } | 1220 | } |
1202 | 1221 | ||
1203 | public void NoLandDataFromStorage() | 1222 | public void EventManagerOnNoLandDataFromStorage() |
1204 | { | 1223 | { |
1205 | ResetSimLandObjects(); | 1224 | ResetSimLandObjects(); |
1206 | } | 1225 | } |
@@ -1224,7 +1243,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1224 | 1243 | ||
1225 | #region CAPS handler | 1244 | #region CAPS handler |
1226 | 1245 | ||
1227 | private void OnRegisterCaps(UUID agentID, Caps caps) | 1246 | private void EventManagerOnRegisterCaps(UUID agentID, Caps caps) |
1228 | { | 1247 | { |
1229 | string capsBase = "/CAPS/" + caps.CapsObjectPath; | 1248 | string capsBase = "/CAPS/" + caps.CapsObjectPath; |
1230 | caps.RegisterHandler("RemoteParcelRequest", | 1249 | caps.RegisterHandler("RemoteParcelRequest", |
@@ -1307,7 +1326,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1307 | 1326 | ||
1308 | #endregion | 1327 | #endregion |
1309 | 1328 | ||
1310 | private void handleParcelDwell(int localID, IClientAPI remoteClient) | 1329 | private void ClientOnParcelDwellRequest(int localID, IClientAPI remoteClient) |
1311 | { | 1330 | { |
1312 | ILandObject selectedParcel = null; | 1331 | ILandObject selectedParcel = null; |
1313 | lock (m_landList) | 1332 | lock (m_landList) |
@@ -1319,7 +1338,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1319 | remoteClient.SendParcelDwellReply(localID, selectedParcel.landData.GlobalID, selectedParcel.landData.Dwell); | 1338 | remoteClient.SendParcelDwellReply(localID, selectedParcel.landData.GlobalID, selectedParcel.landData.Dwell); |
1320 | } | 1339 | } |
1321 | 1340 | ||
1322 | private void handleParcelInfo(IClientAPI remoteClient, UUID parcelID) | 1341 | private void ClientOnParcelInfoRequest(IClientAPI remoteClient, UUID parcelID) |
1323 | { | 1342 | { |
1324 | if (parcelID == UUID.Zero) | 1343 | if (parcelID == UUID.Zero) |
1325 | return; | 1344 | return; |