diff options
author | lbsa71 | 2008-07-08 11:30:08 +0000 |
---|---|---|
committer | lbsa71 | 2008-07-08 11:30:08 +0000 |
commit | 6c13d684899acfd4a8b1d59aad5cdde096def58f (patch) | |
tree | 5ee570f1376497c94d53b959fd7a8f66eb932ea7 | |
parent | * Ignored some bins (diff) | |
download | opensim-SC_OLD-6c13d684899acfd4a8b1d59aad5cdde096def58f.zip opensim-SC_OLD-6c13d684899acfd4a8b1d59aad5cdde096def58f.tar.gz opensim-SC_OLD-6c13d684899acfd4a8b1d59aad5cdde096def58f.tar.bz2 opensim-SC_OLD-6c13d684899acfd4a8b1d59aad5cdde096def58f.tar.xz |
* Changed casing of some archaic methods to conform with code standards
7 files changed, 55 insertions, 55 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index f2eb6a0..6503d81 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -626,19 +626,19 @@ namespace OpenSim.Framework | |||
626 | void SendHealth(float health); | 626 | void SendHealth(float health); |
627 | 627 | ||
628 | 628 | ||
629 | void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID); | 629 | void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID); |
630 | 630 | ||
631 | void sendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID); | 631 | void SendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID); |
632 | 632 | ||
633 | void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args); | 633 | void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args); |
634 | void sendEstateCovenantInformation(); | 634 | void SendEstateCovenantInformation(); |
635 | void sendDetailedEstateData(LLUUID invoice,string estateName, uint estateID); | 635 | void SendDetailedEstateData(LLUUID invoice,string estateName, uint estateID); |
636 | 636 | ||
637 | void sendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags); | 637 | void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags); |
638 | void sendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID); | 638 | void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID); |
639 | void sendForceClientSelectObjects(List<uint> objectIDs); | 639 | void SendForceClientSelectObjects(List<uint> objectIDs); |
640 | void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount); | 640 | void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount); |
641 | void sendLandParcelOverlay(byte[] data, int sequence_id); | 641 | void SendLandParcelOverlay(byte[] data, int sequence_id); |
642 | 642 | ||
643 | void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID); | 643 | void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID); |
644 | void SendConfirmXfer(ulong xferID, uint PacketID); | 644 | void SendConfirmXfer(ulong xferID, uint PacketID); |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 72de55a..7f21fc6 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2576,7 +2576,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2576 | return false; | 2576 | return false; |
2577 | } | 2577 | } |
2578 | 2578 | ||
2579 | public void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) | 2579 | public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) |
2580 | { | 2580 | { |
2581 | EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); | 2581 | EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); |
2582 | packet.AgentData.TransactionID = LLUUID.Random(); | 2582 | packet.AgentData.TransactionID = LLUUID.Random(); |
@@ -2608,7 +2608,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2608 | this.OutPacket(packet, ThrottleOutPacketType.Task); | 2608 | this.OutPacket(packet, ThrottleOutPacketType.Task); |
2609 | } | 2609 | } |
2610 | 2610 | ||
2611 | public void sendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID) | 2611 | public void SendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID) |
2612 | { | 2612 | { |
2613 | RegionBanListItem[] bl = banlist.ToArray(); | 2613 | RegionBanListItem[] bl = banlist.ToArray(); |
2614 | 2614 | ||
@@ -2653,7 +2653,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2653 | this.OutPacket(packet, ThrottleOutPacketType.Task); | 2653 | this.OutPacket(packet, ThrottleOutPacketType.Task); |
2654 | } | 2654 | } |
2655 | 2655 | ||
2656 | public void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) | 2656 | public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) |
2657 | { | 2657 | { |
2658 | RegionInfoPacket rinfopack = new RegionInfoPacket(); | 2658 | RegionInfoPacket rinfopack = new RegionInfoPacket(); |
2659 | RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); | 2659 | RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); |
@@ -2681,7 +2681,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2681 | this.OutPacket(rinfopack, ThrottleOutPacketType.Task); | 2681 | this.OutPacket(rinfopack, ThrottleOutPacketType.Task); |
2682 | } | 2682 | } |
2683 | 2683 | ||
2684 | public void sendEstateCovenantInformation() | 2684 | public void SendEstateCovenantInformation() |
2685 | { | 2685 | { |
2686 | EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); | 2686 | EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); |
2687 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); | 2687 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); |
@@ -2694,7 +2694,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2694 | this.OutPacket(einfopack, ThrottleOutPacketType.Task); | 2694 | this.OutPacket(einfopack, ThrottleOutPacketType.Task); |
2695 | } | 2695 | } |
2696 | 2696 | ||
2697 | public void sendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) | 2697 | public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) |
2698 | { | 2698 | { |
2699 | EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); | 2699 | EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); |
2700 | packet.MethodData.Invoice = invoice; | 2700 | packet.MethodData.Invoice = invoice; |
@@ -2730,7 +2730,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2730 | 2730 | ||
2731 | #region Land Data Sending Methods | 2731 | #region Land Data Sending Methods |
2732 | 2732 | ||
2733 | public void sendLandParcelOverlay(byte[] data, int sequence_id) | 2733 | public void SendLandParcelOverlay(byte[] data, int sequence_id) |
2734 | { | 2734 | { |
2735 | 2735 | ||
2736 | ParcelOverlayPacket packet; | 2736 | ParcelOverlayPacket packet; |
@@ -2741,7 +2741,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2741 | this.OutPacket(packet, ThrottleOutPacketType.Task); | 2741 | this.OutPacket(packet, ThrottleOutPacketType.Task); |
2742 | } | 2742 | } |
2743 | 2743 | ||
2744 | 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) | 2744 | 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) |
2745 | { | 2745 | { |
2746 | ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties); | 2746 | ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties); |
2747 | // TODO: don't create new blocks if recycling an old packet | 2747 | // TODO: don't create new blocks if recycling an old packet |
@@ -2822,7 +2822,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2822 | remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); | 2822 | remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); |
2823 | } | 2823 | } |
2824 | 2824 | ||
2825 | public void sendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) | 2825 | public void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) |
2826 | { | 2826 | { |
2827 | ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); | 2827 | ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); |
2828 | replyPacket.Data.AgentID = this.AgentId; | 2828 | replyPacket.Data.AgentID = this.AgentId; |
@@ -2844,7 +2844,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2844 | this.OutPacket((Packet)replyPacket, ThrottleOutPacketType.Task); | 2844 | this.OutPacket((Packet)replyPacket, ThrottleOutPacketType.Task); |
2845 | } | 2845 | } |
2846 | 2846 | ||
2847 | public void sendForceClientSelectObjects(List<uint> ObjectIDs) | 2847 | public void SendForceClientSelectObjects(List<uint> ObjectIDs) |
2848 | { | 2848 | { |
2849 | bool firstCall = true; | 2849 | bool firstCall = true; |
2850 | int MAX_OBJECTS_PER_PACKET = 251; | 2850 | int MAX_OBJECTS_PER_PACKET = 251; |
@@ -2884,7 +2884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2884 | } | 2884 | } |
2885 | } | 2885 | } |
2886 | 2886 | ||
2887 | public void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) | 2887 | public void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) |
2888 | { | 2888 | { |
2889 | int notifyCount = ownersAndCount.Count; | 2889 | int notifyCount = ownersAndCount.Count; |
2890 | ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); | 2890 | ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); |
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 | ||
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index fb9cd1b..a626f63 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -737,37 +737,37 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
737 | { | 737 | { |
738 | } | 738 | } |
739 | 739 | ||
740 | public void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) | 740 | public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) |
741 | { | 741 | { |
742 | } | 742 | } |
743 | 743 | ||
744 | public void sendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID) | 744 | public void SendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID) |
745 | { | 745 | { |
746 | } | 746 | } |
747 | 747 | ||
748 | public void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) | 748 | public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) |
749 | { | 749 | { |
750 | } | 750 | } |
751 | public void sendEstateCovenantInformation() | 751 | public void SendEstateCovenantInformation() |
752 | { | 752 | { |
753 | } | 753 | } |
754 | public void sendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) | 754 | public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) |
755 | { | 755 | { |
756 | } | 756 | } |
757 | 757 | ||
758 | 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) | 758 | 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) |
759 | { | 759 | { |
760 | } | 760 | } |
761 | public void sendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) | 761 | public void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) |
762 | { | 762 | { |
763 | } | 763 | } |
764 | public void sendForceClientSelectObjects(List<uint> objectIDs) | 764 | public void SendForceClientSelectObjects(List<uint> objectIDs) |
765 | { | 765 | { |
766 | } | 766 | } |
767 | public void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) | 767 | public void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) |
768 | { | 768 | { |
769 | } | 769 | } |
770 | public void sendLandParcelOverlay(byte[] data, int sequence_id) | 770 | public void SendLandParcelOverlay(byte[] data, int sequence_id) |
771 | { | 771 | { |
772 | } | 772 | } |
773 | 773 | ||