diff options
Diffstat (limited to 'OpenSim/Region/Environment/EstateManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/EstateManager.cs | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs index 41d14f0..9e32b35 100644 --- a/OpenSim/Region/Environment/EstateManager.cs +++ b/OpenSim/Region/Environment/EstateManager.cs | |||
@@ -30,12 +30,10 @@ using System.Collections.Generic; | |||
30 | using System.Text; | 30 | using System.Text; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using libsecondlife.Packets; | 32 | using libsecondlife.Packets; |
33 | using OpenSim.Framework.Console; | ||
34 | using OpenSim.Framework.Interfaces; | ||
35 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Console; | ||
36 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Environment.Scenes; |
37 | 36 | ||
38 | |||
39 | namespace OpenSim.Region.Environment | 37 | namespace OpenSim.Region.Environment |
40 | { | 38 | { |
41 | /// <summary> | 39 | /// <summary> |
@@ -216,14 +214,14 @@ namespace OpenSim.Region.Environment | |||
216 | 214 | ||
217 | int tempMaxAgents = | 215 | int tempMaxAgents = |
218 | Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter))); | 216 | Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter))); |
219 | m_regInfo.EstateSettings.maxAgents = (byte)tempMaxAgents; | 217 | m_regInfo.EstateSettings.maxAgents = (byte) tempMaxAgents; |
220 | 218 | ||
221 | float tempObjectBonusFactor = | 219 | float tempObjectBonusFactor = |
222 | (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); | 220 | (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); |
223 | m_regInfo.EstateSettings.objectBonusFactor = tempObjectBonusFactor; | 221 | m_regInfo.EstateSettings.objectBonusFactor = tempObjectBonusFactor; |
224 | 222 | ||
225 | int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter)); | 223 | int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter)); |
226 | m_regInfo.EstateSettings.simAccess = (Simulator.SimAccess)tempMatureLevel; | 224 | m_regInfo.EstateSettings.simAccess = (Simulator.SimAccess) tempMatureLevel; |
227 | 225 | ||
228 | 226 | ||
229 | if (convertParamStringToBool(packet.ParamList[7].Parameter)) | 227 | if (convertParamStringToBool(packet.ParamList[7].Parameter)) |
@@ -250,13 +248,13 @@ namespace OpenSim.Region.Environment | |||
250 | } | 248 | } |
251 | else | 249 | else |
252 | { | 250 | { |
253 | float WaterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter)); | 251 | float WaterHeight = (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter)); |
254 | float TerrainRaiseLimit = | 252 | float TerrainRaiseLimit = |
255 | (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter)); | 253 | (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter)); |
256 | float TerrainLowerLimit = | 254 | float TerrainLowerLimit = |
257 | (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter)); | 255 | (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter)); |
258 | bool UseFixedSun = convertParamStringToBool(packet.ParamList[4].Parameter); | 256 | bool UseFixedSun = convertParamStringToBool(packet.ParamList[4].Parameter); |
259 | float SunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); | 257 | float SunHour = (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); |
260 | 258 | ||
261 | setRegionSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseFixedSun, SunHour); | 259 | setRegionSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseFixedSun, SunHour); |
262 | 260 | ||
@@ -273,8 +271,8 @@ namespace OpenSim.Region.Environment | |||
273 | if (splitField.Length == 3) | 271 | if (splitField.Length == 3) |
274 | { | 272 | { |
275 | Int16 corner = Convert.ToInt16(splitField[0]); | 273 | Int16 corner = Convert.ToInt16(splitField[0]); |
276 | float lowValue = (float)Convert.ToDecimal(splitField[1]); | 274 | float lowValue = (float) Convert.ToDecimal(splitField[1]); |
277 | float highValue = (float)Convert.ToDecimal(splitField[2]); | 275 | float highValue = (float) Convert.ToDecimal(splitField[2]); |
278 | 276 | ||
279 | setEstateTextureRange(corner, lowValue, highValue); | 277 | setEstateTextureRange(corner, lowValue, highValue); |
280 | } | 278 | } |
@@ -343,7 +341,7 @@ namespace OpenSim.Region.Environment | |||
343 | { | 341 | { |
344 | m_scene.Broadcast( | 342 | m_scene.Broadcast( |
345 | sendRegionHandshake | 343 | sendRegionHandshake |
346 | ); | 344 | ); |
347 | } | 345 | } |
348 | 346 | ||
349 | public void sendRegionInfoPacket(IClientAPI remote_client) | 347 | public void sendRegionInfoPacket(IClientAPI remote_client) |
@@ -363,8 +361,8 @@ namespace OpenSim.Region.Environment | |||
363 | regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter; | 361 | regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter; |
364 | regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.EstateSettings.redirectGridX; | 362 | regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.EstateSettings.redirectGridX; |
365 | regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY; | 363 | regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY; |
366 | regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.EstateSettings.regionFlags; | 364 | regionInfoPacket.RegionInfo.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags; |
367 | regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.EstateSettings.simAccess; | 365 | regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.EstateSettings.simAccess; |
368 | regionInfoPacket.RegionInfo.SimName = _enc.GetBytes(m_regInfo.RegionName); | 366 | regionInfoPacket.RegionInfo.SimName = _enc.GetBytes(m_regInfo.RegionName); |
369 | regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour; | 367 | regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour; |
370 | regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.EstateSettings.terrainLowerLimit; | 368 | regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.EstateSettings.terrainLowerLimit; |