OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Changed casing of some archaic methods to conform with code standards

0.6.0-stable
lbsa71 2008-07-08 11:30:08 +00:00
parent ed704f0afc
commit 6c13d68489
7 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Framework/IClientAPI.cs
View File

@ -626,19 +626,19 @@ namespace OpenSim.Framework
void SendHealth(float health); 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<RegionBanListItem> banlist, uint estateID); void SendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID);
void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args); void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args);
void sendEstateCovenantInformation(); void SendEstateCovenantInformation();
void sendDetailedEstateData(LLUUID invoice,string estateName, uint estateID); 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 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<LLUUID> avatars, uint accessFlag, int localLandID); void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID);
void sendForceClientSelectObjects(List<uint> objectIDs); void SendForceClientSelectObjects(List<uint> objectIDs);
void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount); void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount);
void sendLandParcelOverlay(byte[] data, int sequence_id); void SendLandParcelOverlay(byte[] data, int sequence_id);
void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID); void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID);
void SendConfirmXfer(ulong xferID, uint PacketID); void SendConfirmXfer(ulong xferID, uint PacketID);

20
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -2576,7 +2576,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return false; return false;
} }
public void sendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID) public void SendEstateManagersList(LLUUID invoice, LLUUID[] EstateManagers, uint estateID)
{ {
EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
packet.AgentData.TransactionID = LLUUID.Random(); packet.AgentData.TransactionID = LLUUID.Random();
@ -2608,7 +2608,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
this.OutPacket(packet, ThrottleOutPacketType.Task); this.OutPacket(packet, ThrottleOutPacketType.Task);
} }
public void sendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID) public void SendBannedUserList(LLUUID invoice, List<RegionBanListItem> banlist, uint estateID)
{ {
RegionBanListItem[] bl = banlist.ToArray(); RegionBanListItem[] bl = banlist.ToArray();
@ -2653,7 +2653,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
this.OutPacket(packet, ThrottleOutPacketType.Task); this.OutPacket(packet, ThrottleOutPacketType.Task);
} }
public void sendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
{ {
RegionInfoPacket rinfopack = new RegionInfoPacket(); RegionInfoPacket rinfopack = new RegionInfoPacket();
RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock();
@ -2681,7 +2681,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
this.OutPacket(rinfopack, ThrottleOutPacketType.Task); this.OutPacket(rinfopack, ThrottleOutPacketType.Task);
} }
public void sendEstateCovenantInformation() public void SendEstateCovenantInformation()
{ {
EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket();
EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock();
@ -2694,7 +2694,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
this.OutPacket(einfopack, ThrottleOutPacketType.Task); 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(); EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
packet.MethodData.Invoice = invoice; packet.MethodData.Invoice = invoice;
@ -2730,7 +2730,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#region Land Data Sending Methods #region Land Data Sending Methods
public void sendLandParcelOverlay(byte[] data, int sequence_id) public void SendLandParcelOverlay(byte[] data, int sequence_id)
{ {
ParcelOverlayPacket packet; ParcelOverlayPacket packet;
@ -2741,7 +2741,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
this.OutPacket(packet, ThrottleOutPacketType.Task); 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); ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties);
// TODO: don't create new blocks if recycling an old packet // 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); remote_client.OutPacket((Packet)updatePacket, ThrottleOutPacketType.Task);
} }
public void sendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID) public void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID)
{ {
ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply); ParcelAccessListReplyPacket replyPacket = (ParcelAccessListReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelAccessListReply);
replyPacket.Data.AgentID = this.AgentId; replyPacket.Data.AgentID = this.AgentId;
@ -2844,7 +2844,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
this.OutPacket((Packet)replyPacket, ThrottleOutPacketType.Task); this.OutPacket((Packet)replyPacket, ThrottleOutPacketType.Task);
} }
public void sendForceClientSelectObjects(List<uint> ObjectIDs) public void SendForceClientSelectObjects(List<uint> ObjectIDs)
{ {
bool firstCall = true; bool firstCall = true;
int MAX_OBJECTS_PER_PACKET = 251; int MAX_OBJECTS_PER_PACKET = 251;
@ -2884,7 +2884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
public void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) public void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount)
{ {
int notifyCount = ownersAndCount.Count; int notifyCount = ownersAndCount.Count;
ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);

18
OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
View File

@ -49,9 +49,9 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice) private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice)
{ {
remote_client.sendDetailedEstateData(invoice,m_scene.RegionInfo.EstateSettings.estateName,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.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.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, 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"); remote_client.SendAlertMessage("User is already on the region ban list");
} }
//m_scene.RegionInfo.regionBanlist.Add(Manager(user); //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 else
{ {
@ -283,7 +283,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
remote_client.SendAlertMessage("User is not on the region ban list"); remote_client.SendAlertMessage("User is not on the region ban list");
} }
//m_scene.RegionInfo.regionBanlist.Add(Manager(user); //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 else
{ {
@ -297,7 +297,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions())
{ {
m_scene.RegionInfo.EstateSettings.AddEstateManager(user); 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 else
{ {
@ -311,7 +311,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions()) if (remote_client.AgentId == m_scene.RegionInfo.MasterAvatarAssignedUUID || m_scene.ExternalChecks.ExternalChecksBypassPermissions())
{ {
m_scene.RegionInfo.EstateSettings.RemoveEstateManager(user); 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 else
{ {
@ -399,12 +399,12 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
args.simName = m_scene.RegionInfo.RegionName; args.simName = m_scene.RegionInfo.RegionName;
remote_client.sendRegionInfoToEstateMenu(args); remote_client.SendRegionInfoToEstateMenu(args);
} }
private static void HandleEstateCovenantRequest(IClientAPI remote_client) 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) private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient)
{ {

2
OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
View File

@ -834,7 +834,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
byteArrayCount++; byteArrayCount++;
if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
{ {
remote_client.sendLandParcelOverlay(byteArray, sequenceID); remote_client.SendLandParcelOverlay(byteArray, sequenceID);
byteArrayCount = 0; byteArrayCount = 0;
sequenceID++; sequenceID++;
byteArray = new byte[LAND_BLOCKS_PER_PACKET]; byteArray = new byte[LAND_BLOCKS_PER_PACKET];

10
OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
View File

@ -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) 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) 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) if (flags == (uint) ParcelManager.AccessList.Access || flags == (uint) ParcelManager.AccessList.Both)
{ {
List<LLUUID> avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Access); List<LLUUID> 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) if (flags == (uint) ParcelManager.AccessList.Ban || flags == (uint) ParcelManager.AccessList.Both)
{ {
List<LLUUID> avatars = createAccessListArrayByFlag(ParcelManager.AccessList.Ban); List<LLUUID> 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."); 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);
} }
} }

20
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -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<RegionBanListItem> banlist, uint estateID) public void SendBannedUserList(LLUUID invoice, List<RegionBanListItem> 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<LLUUID> avatars, uint accessFlag, int localLandID) public void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID)
{ {
} }
public void sendForceClientSelectObjects(List<uint> objectIDs) public void SendForceClientSelectObjects(List<uint> objectIDs)
{ {
} }
public void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) public void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount)
{ {
} }
public void sendLandParcelOverlay(byte[] data, int sequence_id) public void SendLandParcelOverlay(byte[] data, int sequence_id)
{ {
} }

20
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -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<RegionBanListItem> banlist, uint estateID) public void SendBannedUserList(LLUUID invoice, List<RegionBanListItem> 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<LLUUID> avatars, uint accessFlag, int localLandID) public void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID)
{ {
} }
public void sendForceClientSelectObjects(List<uint> objectIDs) public void SendForceClientSelectObjects(List<uint> objectIDs)
{ {
} }
public void sendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount) public void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount)
{ {
} }
public void sendLandParcelOverlay(byte[] data, int sequence_id) public void SendLandParcelOverlay(byte[] data, int sequence_id)
{ {
} }