From efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 27 Dec 2007 21:41:48 +0000 Subject: * Optimized usings * shortened references * Removed redundant 'this' * Normalized EOF --- OpenSim/Region/Environment/EstateManager.cs | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region/Environment/EstateManager.cs') diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs index 081a8cd..3ca9796 100644 --- a/OpenSim/Region/Environment/EstateManager.cs +++ b/OpenSim/Region/Environment/EstateManager.cs @@ -334,6 +334,7 @@ namespace OpenSim.Region.Environment } } } + private void estateRestartSim(EstateOwnerMessagePacket packet) { // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart. @@ -341,26 +342,25 @@ namespace OpenSim.Region.Environment { float timeSeconds = 0; timeSeconds = BitConverter.ToInt16(block.Parameter, 1); - timeSeconds = (int)((timeSeconds / 100) - 3); + timeSeconds = (int) ((timeSeconds/100) - 3); m_scene.Restart(timeSeconds); - } } + private void EstateChangeCovenant(EstateOwnerMessagePacket packet) { foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList) { LLUUID newCovenantID = new LLUUID(Helpers.FieldToUTF8String(block.Parameter)); m_regInfo.CovenantID = newCovenantID; - } - } + public void HandleRegionInfoRequest(IClientAPI client, LLUUID sessionID) { RegionInfoPacket rinfopack = new RegionInfoPacket(); RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); - + rinfoblk.BillableFactor = 0; rinfoblk.EstateID = 02; rinfoblk.MaxAgents = 100; @@ -369,20 +369,20 @@ namespace OpenSim.Region.Environment rinfoblk.PricePerMeter = 0; rinfoblk.RedirectGridX = 0; rinfoblk.RedirectGridY = 0; - rinfoblk.RegionFlags = (uint)m_regInfo.EstateSettings.regionFlags; - rinfoblk.SimAccess = (byte)m_regInfo.EstateSettings.simAccess; + rinfoblk.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags; + rinfoblk.SimAccess = (byte) m_regInfo.EstateSettings.simAccess; rinfoblk.SunHour = m_regInfo.EstateSettings.sunHour; rinfoblk.TerrainLowerLimit = 20; rinfoblk.TerrainRaiseLimit = 20; rinfoblk.UseEstateSun = true; rinfoblk.WaterHeight = m_regInfo.EstateSettings.waterHeight; rinfoblk.SimName = Helpers.StringToField(m_regInfo.RegionName); - + rinfopack.RegionInfo = rinfoblk; client.OutPacket(rinfopack, ThrottleOutPacketType.Task); - } + public void HandleEstateCovenantRequest(IClientAPI client, LLUUID sessionID) { EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); @@ -390,10 +390,12 @@ namespace OpenSim.Region.Environment edata.CovenantID = m_regInfo.CovenantID; edata.CovenantTimestamp = 0; edata.EstateOwnerID = m_regInfo.MasterAvatarAssignedUUID; - edata.EstateName = Helpers.StringToField(m_regInfo.MasterAvatarFirstName + " " + m_regInfo.MasterAvatarLastName); + edata.EstateName = + Helpers.StringToField(m_regInfo.MasterAvatarFirstName + " " + m_regInfo.MasterAvatarLastName); einfopack.Data = edata; client.OutPacket(einfopack, ThrottleOutPacketType.Task); } + #endregion #region Outgoing Packets @@ -451,4 +453,4 @@ namespace OpenSim.Region.Environment #endregion } -} +} \ No newline at end of file -- cgit v1.1