diff options
Diffstat (limited to 'OpenSim/Region/Environment')
4 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 3f8cc0b..9ef3e10 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -49,9 +49,9 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
49 | 49 | ||
50 | private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice) | 50 | private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice) |
51 | { | 51 | { |
52 | remote_client.sendDetailedEstateData(invoice,m_scene.RegionInfo.EstateSettings.estateName,m_scene.RegionInfo.EstateSettings.estateID); | 52 | remote_client.SendDetailedEstateData(invoice,m_scene.RegionInfo.EstateSettings.estateName,m_scene.RegionInfo.EstateSettings.estateID); |
53 | remote_client.sendEstateManagersList(invoice,m_scene.RegionInfo.EstateSettings.estateManagers,m_scene.RegionInfo.EstateSettings.estateID); | 53 | remote_client.SendEstateManagersList(invoice,m_scene.RegionInfo.EstateSettings.estateManagers,m_scene.RegionInfo.EstateSettings.estateID); |
54 | remote_client.sendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); | 54 | remote_client.SendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); |
55 | } | 55 | } |
56 | 56 | ||
57 | private void estateSetRegionInfoHandler(bool blockTerraform, bool noFly, bool allowDamage, bool blockLandResell, int maxAgents, float objectBonusFactor, | 57 | private void estateSetRegionInfoHandler(bool blockTerraform, bool noFly, bool allowDamage, bool blockLandResell, int maxAgents, float objectBonusFactor, |
@@ -248,7 +248,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
248 | remote_client.SendAlertMessage("User is already on the region ban list"); | 248 | remote_client.SendAlertMessage("User is already on the region ban list"); |
249 | } | 249 | } |
250 | //m_scene.RegionInfo.regionBanlist.Add(Manager(user); | 250 | //m_scene.RegionInfo.regionBanlist.Add(Manager(user); |
251 | remote_client.sendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); | 251 | remote_client.SendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); |
252 | } | 252 | } |
253 | else | 253 | else |
254 | { | 254 | { |
@@ -283,7 +283,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
283 | remote_client.SendAlertMessage("User is not on the region ban list"); | 283 | remote_client.SendAlertMessage("User is not on the region ban list"); |
284 | } | 284 | } |
285 | //m_scene.RegionInfo.regionBanlist.Add(Manager(user); | 285 | //m_scene.RegionInfo.regionBanlist.Add(Manager(user); |
286 | remote_client.sendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); | 286 | remote_client.SendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); |
287 | } | 287 | } |
288 | else | 288 | else |
289 | { | 289 | { |
@@ -297,7 +297,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
297 | if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 297 | if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) |
298 | { | 298 | { |
299 | m_scene.RegionInfo.EstateSettings.AddEstateManager(user); | 299 | m_scene.RegionInfo.EstateSettings.AddEstateManager(user); |
300 | remote_client.sendEstateManagersList(invoice, m_scene.RegionInfo.EstateSettings.estateManagers, m_scene.RegionInfo.EstateSettings.estateID); | 300 | remote_client.SendEstateManagersList(invoice, m_scene.RegionInfo.EstateSettings.estateManagers, m_scene.RegionInfo.EstateSettings.estateID); |
301 | } | 301 | } |
302 | else | 302 | else |
303 | { | 303 | { |
@@ -311,7 +311,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
311 | if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) | 311 | if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) |
312 | { | 312 | { |
313 | m_scene.RegionInfo.EstateSettings.RemoveEstateManager(user); | 313 | m_scene.RegionInfo.EstateSettings.RemoveEstateManager(user); |
314 | remote_client.sendEstateManagersList(invoice, m_scene.RegionInfo.EstateSettings.estateManagers, m_scene.RegionInfo.EstateSettings.estateID); | 314 | remote_client.SendEstateManagersList(invoice, m_scene.RegionInfo.EstateSettings.estateManagers, m_scene.RegionInfo.EstateSettings.estateID); |
315 | } | 315 | } |
316 | else | 316 | else |
317 | { | 317 | { |
@@ -399,12 +399,12 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
399 | args.simName = m_scene.RegionInfo.RegionName; | 399 | args.simName = m_scene.RegionInfo.RegionName; |
400 | 400 | ||
401 | 401 | ||
402 | remote_client.sendRegionInfoToEstateMenu(args); | 402 | remote_client.SendRegionInfoToEstateMenu(args); |
403 | } | 403 | } |
404 | 404 | ||
405 | private static void HandleEstateCovenantRequest(IClientAPI remote_client) | 405 | private static void HandleEstateCovenantRequest(IClientAPI remote_client) |
406 | { | 406 | { |
407 | remote_client.sendEstateCovenantInformation(); | 407 | remote_client.SendEstateCovenantInformation(); |
408 | } | 408 | } |
409 | private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient) | 409 | private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient) |
410 | { | 410 | { |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index 7898a30..b2456a2 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs | |||
@@ -834,7 +834,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
834 | byteArrayCount++; | 834 | byteArrayCount++; |
835 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) | 835 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) |
836 | { | 836 | { |
837 | remote_client.sendLandParcelOverlay(byteArray, sequenceID); | 837 | remote_client.SendLandParcelOverlay(byteArray, sequenceID); |
838 | byteArrayCount = 0; | 838 | byteArrayCount = 0; |
839 | sequenceID++; | 839 | sequenceID++; |
840 | byteArray = new byte[LAND_BLOCKS_PER_PACKET]; | 840 | byteArray = new byte[LAND_BLOCKS_PER_PACKET]; |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index 2ff48cc..2b24435 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -161,7 +161,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
161 | 161 | ||
162 | public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) | 162 | public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) |
163 | { | 163 | { |
164 | remote_client.sendLandProperties(remote_client, sequence_id, snap_selection, request_result, landData, m_scene.RegionInfo.EstateSettings.objectBonusFactor, getParcelMaxPrimCount(this), getSimulatorMaxPrimCount(this), (uint)m_scene.RegionInfo.EstateSettings.regionFlags); | 164 | remote_client.SendLandProperties(remote_client, sequence_id, snap_selection, request_result, landData, m_scene.RegionInfo.EstateSettings.objectBonusFactor, getParcelMaxPrimCount(this), getSimulatorMaxPrimCount(this), (uint)m_scene.RegionInfo.EstateSettings.regionFlags); |
165 | } | 165 | } |
166 | 166 | ||
167 | public void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client) | 167 | public void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client) |
@@ -332,13 +332,13 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
332 | if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both) | 332 | if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both) |
333 | { | 333 | { |
334 | List<LLUUID> avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Access); | 334 | List<LLUUID> avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Access); |
335 | remote_client.sendLandAccessListData(avatars,(uint) ParcelManager.AccessList.Access,landData.localID); | 335 | remote_client.SendLandAccessListData(avatars,(uint) ParcelManager.AccessList.Access,landData.localID); |
336 | } | 336 | } |
337 | 337 | ||
338 | if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both) | 338 | if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both) |
339 | { | 339 | { |
340 | List<LLUUID> avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Ban); | 340 | List<LLUUID> avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Ban); |
341 | remote_client.sendLandAccessListData(avatars, (uint)ParcelManager.AccessList.Ban, landData.localID); | 341 | remote_client.SendLandAccessListData(avatars, (uint)ParcelManager.AccessList.Ban, landData.localID); |
342 | } | 342 | } |
343 | } | 343 | } |
344 | 344 | ||
@@ -663,7 +663,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
663 | m_log.Error("[LAND]: Unable to force select the parcel objects. Arr."); | 663 | m_log.Error("[LAND]: Unable to force select the parcel objects. Arr."); |
664 | } | 664 | } |
665 | 665 | ||
666 | remote_client.sendForceClientSelectObjects(resultLocalIDs); | 666 | remote_client.SendForceClientSelectObjects(resultLocalIDs); |
667 | } | 667 | } |
668 | } | 668 | } |
669 | 669 | ||
@@ -715,7 +715,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
715 | } | 715 | } |
716 | } | 716 | } |
717 | 717 | ||
718 | remote_client.sendLandObjectOwners(primCount); | 718 | remote_client.SendLandObjectOwners(primCount); |
719 | } | 719 | } |
720 | } | 720 | } |
721 | 721 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index a8ad56f..4fc43d3 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -748,37 +748,37 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
748 | { | 748 | { |
749 | } | 749 | } |
750 | 750 | ||
751 | public void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) | 751 | public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) |
752 | { | 752 | { |
753 | } | 753 | } |
754 | 754 | ||
755 | public void sendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID) | 755 | public void SendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID) |
756 | { | 756 | { |
757 | } | 757 | } |
758 | 758 | ||
759 | public void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) | 759 | public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) |
760 | { | 760 | { |
761 | } | 761 | } |
762 | public void sendEstateCovenantInformation() | 762 | public void SendEstateCovenantInformation() |
763 | { | 763 | { |
764 | } | 764 | } |
765 | public void sendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) | 765 | public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) |
766 | { | 766 | { |
767 | } | 767 | } |
768 | 768 | ||
769 | public void sendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) | 769 | public void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) |
770 | { | 770 | { |
771 | } | 771 | } |
772 | public void sendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) | 772 | public void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) |
773 | { | 773 | { |
774 | } | 774 | } |
775 | public void sendForceClientSelectObjects(List<uint> objectIDs) | 775 | public void SendForceClientSelectObjects(List<uint> objectIDs) |
776 | { | 776 | { |
777 | } | 777 | } |
778 | public void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) | 778 | public void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) |
779 | { | 779 | { |
780 | } | 780 | } |
781 | public void sendLandParcelOverlay(byte[] data, int sequence_id) | 781 | public void SendLandParcelOverlay(byte[] data, int sequence_id) |
782 | { | 782 | { |
783 | } | 783 | } |
784 | 784 | ||