From 6c13d684899acfd4a8b1d59aad5cdde096def58f Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 8 Jul 2008 11:30:08 +0000 Subject: * Changed casing of some archaic methods to conform with code standards --- OpenSim/Framework/IClientAPI.cs | 20 ++++++++++---------- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 20 ++++++++++---------- .../Modules/World/Estate/EstateManagementModule.cs | 18 +++++++++--------- .../Modules/World/Land/LandManagementModule.cs | 2 +- .../Environment/Modules/World/Land/LandObject.cs | 10 +++++----- .../Environment/Modules/World/NPC/NPCAvatar.cs | 20 ++++++++++---------- .../Region/Examples/SimpleModule/MyNpcCharacter.cs | 20 ++++++++++---------- 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 void SendHealth(float health); - void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID); + void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID); - void sendBannedUserList(LLUUID invoice, List banlist, uint estateID); + void SendBannedUserList(LLUUID invoice, List banlist, uint estateID); - void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args); - void sendEstateCovenantInformation(); - void sendDetailedEstateData(LLUUID invoice,string estateName, uint estateID); + void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args); + void SendEstateCovenantInformation(); + void SendDetailedEstateData(LLUUID invoice,string estateName, uint estateID); - void sendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags); - void sendLandAccessListData(List avatars, uint accessFlag, int localLandID); - void sendForceClientSelectObjects(List objectIDs); - void sendLandObjectOwners(Dictionary ownersAndCount); - void sendLandParcelOverlay(byte[] data, int sequence_id); + void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags); + void SendLandAccessListData(List avatars, uint accessFlag, int localLandID); + void SendForceClientSelectObjects(List objectIDs); + void SendLandObjectOwners(Dictionary ownersAndCount); + void SendLandParcelOverlay(byte[] data, int sequence_id); void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID); 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 return false; } - public void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) + public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) { EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); packet.AgentData.TransactionID = LLUUID.Random(); @@ -2608,7 +2608,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP this.OutPacket(packet, ThrottleOutPacketType.Task); } - public void sendBannedUserList(LLUUID invoice, List banlist, uint estateID) + public void SendBannedUserList(LLUUID invoice, List banlist, uint estateID) { RegionBanListItem[] bl = banlist.ToArray(); @@ -2653,7 +2653,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP this.OutPacket(packet, ThrottleOutPacketType.Task); } - public void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) + public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) { RegionInfoPacket rinfopack = new RegionInfoPacket(); RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); @@ -2681,7 +2681,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP this.OutPacket(rinfopack, ThrottleOutPacketType.Task); } - public void sendEstateCovenantInformation() + public void SendEstateCovenantInformation() { EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); @@ -2694,7 +2694,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP this.OutPacket(einfopack, ThrottleOutPacketType.Task); } - public void sendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) + public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) { EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); packet.MethodData.Invoice = invoice; @@ -2730,7 +2730,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP #region Land Data Sending Methods - public void sendLandParcelOverlay(byte[] data, int sequence_id) + public void SendLandParcelOverlay(byte[] data, int sequence_id) { ParcelOverlayPacket packet; @@ -2741,7 +2741,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP this.OutPacket(packet, ThrottleOutPacketType.Task); } - 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) + 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) { ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties); // TODO: don't create new blocks if recycling an old packet @@ -2822,7 +2822,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task); } - public void sendLandAccessListData(List avatars, uint accessFlag, int localLandID) + public void SendLandAccessListData(List avatars, uint accessFlag, int localLandID) { ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); replyPacket.Data.AgentID = this.AgentId; @@ -2844,7 +2844,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP this.OutPacket((Packet)replyPacket, ThrottleOutPacketType.Task); } - public void sendForceClientSelectObjects(List ObjectIDs) + public void SendForceClientSelectObjects(List ObjectIDs) { bool firstCall = true; int MAX_OBJECTS_PER_PACKET = 251; @@ -2884,7 +2884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } } - public void sendLandObjectOwners(Dictionary ownersAndCount) + public void SendLandObjectOwners(Dictionary ownersAndCount) { int notifyCount = ownersAndCount.Count; 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 private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice) { - remote_client.sendDetailedEstateData(invoice,m_scene.RegionInfo.EstateSettings.estateName,m_scene.RegionInfo.EstateSettings.estateID); - remote_client.sendEstateManagersList(invoice,m_scene.RegionInfo.EstateSettings.estateManagers,m_scene.RegionInfo.EstateSettings.estateID); - remote_client.sendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); + remote_client.SendDetailedEstateData(invoice,m_scene.RegionInfo.EstateSettings.estateName,m_scene.RegionInfo.EstateSettings.estateID); + remote_client.SendEstateManagersList(invoice,m_scene.RegionInfo.EstateSettings.estateManagers,m_scene.RegionInfo.EstateSettings.estateID); + remote_client.SendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); } 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 remote_client.SendAlertMessage("User is already on the region ban list"); } //m_scene.RegionInfo.regionBanlist.Add(Manager(user); - remote_client.sendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); + remote_client.SendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); } else { @@ -283,7 +283,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate remote_client.SendAlertMessage("User is not on the region ban list"); } //m_scene.RegionInfo.regionBanlist.Add(Manager(user); - remote_client.sendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); + remote_client.SendBannedUserList(invoice, m_scene.RegionInfo.regionBanlist, m_scene.RegionInfo.EstateSettings.estateID); } else { @@ -297,7 +297,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) { m_scene.RegionInfo.EstateSettings.AddEstateManager(user); - remote_client.sendEstateManagersList(invoice, m_scene.RegionInfo.EstateSettings.estateManagers, m_scene.RegionInfo.EstateSettings.estateID); + remote_client.SendEstateManagersList(invoice, m_scene.RegionInfo.EstateSettings.estateManagers, m_scene.RegionInfo.EstateSettings.estateID); } else { @@ -311,7 +311,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) { m_scene.RegionInfo.EstateSettings.RemoveEstateManager(user); - remote_client.sendEstateManagersList(invoice, m_scene.RegionInfo.EstateSettings.estateManagers, m_scene.RegionInfo.EstateSettings.estateID); + remote_client.SendEstateManagersList(invoice, m_scene.RegionInfo.EstateSettings.estateManagers, m_scene.RegionInfo.EstateSettings.estateID); } else { @@ -399,12 +399,12 @@ namespace OpenSim.Region.Environment.Modules.World.Estate args.simName = m_scene.RegionInfo.RegionName; - remote_client.sendRegionInfoToEstateMenu(args); + remote_client.SendRegionInfoToEstateMenu(args); } private static void HandleEstateCovenantRequest(IClientAPI remote_client) { - remote_client.sendEstateCovenantInformation(); + remote_client.SendEstateCovenantInformation(); } private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient) { 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 byteArrayCount++; if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) { - remote_client.sendLandParcelOverlay(byteArray, sequenceID); + remote_client.SendLandParcelOverlay(byteArray, sequenceID); byteArrayCount = 0; sequenceID++; 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 public void sendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) { - 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); + 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); } public void updateLandProperties(LandUpdateArgs args, IClientAPI remote_client) @@ -332,13 +332,13 @@ namespace OpenSim.Region.Environment.Modules.World.Land if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both) { List avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Access); - remote_client.sendLandAccessListData(avatars,(uint) ParcelManager.AccessList.Access,landData.localID); + remote_client.SendLandAccessListData(avatars,(uint) ParcelManager.AccessList.Access,landData.localID); } if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both) { List avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Ban); - remote_client.sendLandAccessListData(avatars, (uint)ParcelManager.AccessList.Ban, landData.localID); + remote_client.SendLandAccessListData(avatars, (uint)ParcelManager.AccessList.Ban, landData.localID); } } @@ -663,7 +663,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land m_log.Error("[LAND]: Unable to force select the parcel objects. Arr."); } - remote_client.sendForceClientSelectObjects(resultLocalIDs); + remote_client.SendForceClientSelectObjects(resultLocalIDs); } } @@ -715,7 +715,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land } } - remote_client.sendLandObjectOwners(primCount); + remote_client.SendLandObjectOwners(primCount); } } 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 { } - public void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) + public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) { } - public void sendBannedUserList(LLUUID invoice, List banlist, uint estateID) + public void SendBannedUserList(LLUUID invoice, List banlist, uint estateID) { } - public void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) + public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) { } - public void sendEstateCovenantInformation() + public void SendEstateCovenantInformation() { } - public void sendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) + public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) { } - 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) + 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) { } - public void sendLandAccessListData(List avatars, uint accessFlag, int localLandID) + public void SendLandAccessListData(List avatars, uint accessFlag, int localLandID) { } - public void sendForceClientSelectObjects(List objectIDs) + public void SendForceClientSelectObjects(List objectIDs) { } - public void sendLandObjectOwners(Dictionary ownersAndCount) + public void SendLandObjectOwners(Dictionary ownersAndCount) { } - public void sendLandParcelOverlay(byte[] data, int sequence_id) + public void SendLandParcelOverlay(byte[] data, int sequence_id) { } 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 { } - public void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) + public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) { } - public void sendBannedUserList(LLUUID invoice, List banlist, uint estateID) + public void SendBannedUserList(LLUUID invoice, List banlist, uint estateID) { } - public void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) + public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) { } - public void sendEstateCovenantInformation() + public void SendEstateCovenantInformation() { } - public void sendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) + public void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID) { } - 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) + 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) { } - public void sendLandAccessListData(List avatars, uint accessFlag, int localLandID) + public void SendLandAccessListData(List avatars, uint accessFlag, int localLandID) { } - public void sendForceClientSelectObjects(List objectIDs) + public void SendForceClientSelectObjects(List objectIDs) { } - public void sendLandObjectOwners(Dictionary ownersAndCount) + public void SendLandObjectOwners(Dictionary ownersAndCount) { } - public void sendLandParcelOverlay(byte[] data, int sequence_id) + public void SendLandParcelOverlay(byte[] data, int sequence_id) { } -- cgit v1.1