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

*Fixed a mistake in the EstateManagementModule that messed up the trunk.

0.6.0-stable
mingchen 2008-05-04 19:19:18 +00:00
parent 63c104efde
commit ddb3a9bdf8
4 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/IClientAPI.cs
View File

@ -768,6 +768,7 @@ namespace OpenSim.Framework
void sendEstateManagersList(LLUUID invoice); void sendEstateManagersList(LLUUID invoice);
void sendRegionInfoToEstateMenu(); void sendRegionInfoToEstateMenu();
void sendEstateCovenantInformation(); void sendEstateCovenantInformation();
void sendDetailedEstateData(LLUUID invoice);
byte[] GetThrottlesPacked(float multiplier); byte[] GetThrottlesPacked(float multiplier);

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

@ -2240,6 +2240,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
einfopack.Data = edata; einfopack.Data = edata;
this.OutPacket(einfopack, ThrottleOutPacketType.Task); this.OutPacket(einfopack, ThrottleOutPacketType.Task);
} }
public void sendDetailedEstateData(LLUUID invoice)
{
EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
packet.MethodData.Invoice = invoice;
packet.AgentData.TransactionID = LLUUID.Random();
packet.MethodData.Method = Helpers.StringToField("estateupdateinfo");
EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[9];
for (int i = 0; i < 9; i++)
{
returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
}
//Sending Estate Settings
returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateName);
returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString());
// TODO: Resolve Magic numbers here
returnblock[3].Parameter = Helpers.StringToField("269516800");
returnblock[4].Parameter = Helpers.StringToField("0");
returnblock[5].Parameter = Helpers.StringToField("1");
returnblock[6].Parameter = Helpers.StringToField(m_scene.RegionInfo.RegionID.ToString());
returnblock[7].Parameter = Helpers.StringToField("1160895077");
returnblock[8].Parameter = Helpers.StringToField("1");
packet.ParamList = returnblock;
packet.Header.Reliable = false;
//System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
this.OutPacket(packet, ThrottleOutPacketType.Task);
}
#endregion #endregion
#region Helper Methods #region Helper Methods

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

@ -51,35 +51,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice) private void sendDetailedEstateData(IClientAPI remote_client, LLUUID invoice)
{ {
EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); remote_client.sendDetailedEstateData(invoice);
packet.MethodData.Invoice = invoice;
packet.AgentData.TransactionID = LLUUID.Random();
packet.MethodData.Method = Helpers.StringToField("estateupdateinfo");
EstateOwnerMessagePacket.ParamListBlock[] returnblock = new EstateOwnerMessagePacket.ParamListBlock[9];
for (int i = 0; i < 9; i++)
{
returnblock[i] = new EstateOwnerMessagePacket.ParamListBlock();
}
//Sending Estate Settings
returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateName);
returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString());
// TODO: Resolve Magic numbers here
returnblock[3].Parameter = Helpers.StringToField("269516800");
returnblock[4].Parameter = Helpers.StringToField("0");
returnblock[5].Parameter = Helpers.StringToField("1");
returnblock[6].Parameter = Helpers.StringToField(m_scene.RegionInfo.RegionID.ToString());
returnblock[7].Parameter = Helpers.StringToField("1160895077");
returnblock[8].Parameter = Helpers.StringToField("1");
packet.ParamList = returnblock;
packet.Header.Reliable = false;
//System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString());
remote_client.OutPacket(packet, ThrottleOutPacketType.Task);
remote_client.sendEstateManagersList(invoice); remote_client.sendEstateManagersList(invoice);
} }

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

@ -642,5 +642,8 @@ namespace OpenSim.Region.Examples.SimpleModule
public void sendEstateCovenantInformation() public void sendEstateCovenantInformation()
{ {
} }
public void sendDetailedEstateData(LLUUID invoice)
{
}
} }
} }