aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/EstateManager.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs32
1 files changed, 17 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index 63f2a53..ec556a6 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -289,7 +289,7 @@ namespace OpenSim.Region.Environment
289 } 289 }
290 290
291 //Sending Estate Settings 291 //Sending Estate Settings
292 returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarFirstName + m_scene.RegionInfo.MasterAvatarLastName); 292 returnblock[0].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateName);
293 returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString()); 293 returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
294 returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString()); 294 returnblock[2].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.estateID.ToString());
295 295
@@ -578,21 +578,22 @@ namespace OpenSim.Region.Environment
578 { 578 {
579 RegionInfoPacket rinfopack = new RegionInfoPacket(); 579 RegionInfoPacket rinfopack = new RegionInfoPacket();
580 RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); 580 RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock();
581 581 rinfopack.AgentData.AgentID = client.AgentId;
582 rinfoblk.BillableFactor = 0; 582 rinfopack.AgentData.SessionID = client.SessionId;
583 rinfoblk.EstateID = 02; 583 rinfoblk.BillableFactor = m_regInfo.EstateSettings.billableFactor;
584 rinfoblk.MaxAgents = 100; 584 rinfoblk.EstateID = m_regInfo.EstateSettings.estateID;
585 rinfoblk.ObjectBonusFactor = 1.0f; 585 rinfoblk.MaxAgents = m_regInfo.EstateSettings.maxAgents;
586 rinfoblk.ParentEstateID = 0; 586 rinfoblk.ObjectBonusFactor = m_regInfo.EstateSettings.objectBonusFactor;
587 rinfoblk.PricePerMeter = 0; 587 rinfoblk.ParentEstateID = m_regInfo.EstateSettings.parentEstateID;
588 rinfoblk.RedirectGridX = 0; 588 rinfoblk.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter;
589 rinfoblk.RedirectGridY = 0; 589 rinfoblk.RedirectGridX = m_regInfo.EstateSettings.redirectGridX;
590 rinfoblk.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags; 590 rinfoblk.RedirectGridY = m_regInfo.EstateSettings.redirectGridY;
591 rinfoblk.RegionFlags = (uint)( m_regInfo.EstateSettings.regionFlags);
591 rinfoblk.SimAccess = (byte) m_regInfo.EstateSettings.simAccess; 592 rinfoblk.SimAccess = (byte) m_regInfo.EstateSettings.simAccess;
592 rinfoblk.SunHour = m_regInfo.EstateSettings.sunHour; 593 rinfoblk.SunHour = m_regInfo.EstateSettings.sunHour;
593 rinfoblk.TerrainLowerLimit = 20; 594 rinfoblk.TerrainLowerLimit = m_regInfo.EstateSettings.terrainLowerLimit;
594 rinfoblk.TerrainRaiseLimit = 20; 595 rinfoblk.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit;
595 rinfoblk.UseEstateSun = true; 596 rinfoblk.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun;
596 rinfoblk.WaterHeight = m_regInfo.EstateSettings.waterHeight; 597 rinfoblk.WaterHeight = m_regInfo.EstateSettings.waterHeight;
597 rinfoblk.SimName = Helpers.StringToField(m_regInfo.RegionName); 598 rinfoblk.SimName = Helpers.StringToField(m_regInfo.RegionName);
598 599
@@ -650,7 +651,7 @@ namespace OpenSim.Region.Environment
650 regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter; 651 regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter;
651 regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.EstateSettings.redirectGridX; 652 regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.EstateSettings.redirectGridX;
652 regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY; 653 regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY;
653 regionInfoPacket.RegionInfo.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags; 654 regionInfoPacket.RegionInfo.RegionFlags = (uint)(m_regInfo.EstateSettings.regionFlags);
654 regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.EstateSettings.simAccess; 655 regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.EstateSettings.simAccess;
655 regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_regInfo.RegionName); 656 regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_regInfo.RegionName);
656 regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour; 657 regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour;
@@ -658,6 +659,7 @@ namespace OpenSim.Region.Environment
658 regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit; 659 regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit;
659 regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun; 660 regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun;
660 regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.EstateSettings.waterHeight; 661 regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.EstateSettings.waterHeight;
662
661 663
662 remote_client.OutPacket(regionInfoPacket, ThrottleOutPacketType.Task); 664 remote_client.OutPacket(regionInfoPacket, ThrottleOutPacketType.Task);
663 } 665 }