diff options
Diffstat (limited to 'OpenSim/Region/Environment/EstateManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/EstateManager.cs | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs index ac710ad..97e25d5 100644 --- a/OpenSim/Region/Environment/EstateManager.cs +++ b/OpenSim/Region/Environment/EstateManager.cs | |||
@@ -216,14 +216,14 @@ namespace OpenSim.Region.Environment | |||
216 | 216 | ||
217 | int tempMaxAgents = | 217 | int tempMaxAgents = |
218 | Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter))); | 218 | Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter))); |
219 | m_regInfo.estateSettings.maxAgents = (byte) tempMaxAgents; | 219 | m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents; |
220 | 220 | ||
221 | float tempObjectBonusFactor = | 221 | float tempObjectBonusFactor = |
222 | (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); | 222 | (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); |
223 | m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor; | 223 | m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor; |
224 | 224 | ||
225 | int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter)); | 225 | int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter)); |
226 | m_regInfo.estateSettings.simAccess = (Simulator.SimAccess) tempMatureLevel; | 226 | m_regInfo.estateSettings.simAccess = (Simulator.SimAccess)tempMatureLevel; |
227 | 227 | ||
228 | 228 | ||
229 | if (convertParamStringToBool(packet.ParamList[7].Parameter)) | 229 | if (convertParamStringToBool(packet.ParamList[7].Parameter)) |
@@ -250,13 +250,13 @@ namespace OpenSim.Region.Environment | |||
250 | } | 250 | } |
251 | else | 251 | else |
252 | { | 252 | { |
253 | float WaterHeight = (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter)); | 253 | float WaterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter)); |
254 | float TerrainRaiseLimit = | 254 | float TerrainRaiseLimit = |
255 | (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter)); | 255 | (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter)); |
256 | float TerrainLowerLimit = | 256 | float TerrainLowerLimit = |
257 | (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter)); | 257 | (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter)); |
258 | bool UseFixedSun = convertParamStringToBool(packet.ParamList[4].Parameter); | 258 | bool UseFixedSun = convertParamStringToBool(packet.ParamList[4].Parameter); |
259 | float SunHour = (float) Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); | 259 | float SunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter)); |
260 | 260 | ||
261 | setRegionSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseFixedSun, SunHour); | 261 | setRegionSettings(WaterHeight, TerrainRaiseLimit, TerrainLowerLimit, UseFixedSun, SunHour); |
262 | 262 | ||
@@ -273,8 +273,8 @@ namespace OpenSim.Region.Environment | |||
273 | if (splitField.Length == 3) | 273 | if (splitField.Length == 3) |
274 | { | 274 | { |
275 | Int16 corner = Convert.ToInt16(splitField[0]); | 275 | Int16 corner = Convert.ToInt16(splitField[0]); |
276 | float lowValue = (float) Convert.ToDecimal(splitField[1]); | 276 | float lowValue = (float)Convert.ToDecimal(splitField[1]); |
277 | float highValue = (float) Convert.ToDecimal(splitField[2]); | 277 | float highValue = (float)Convert.ToDecimal(splitField[2]); |
278 | 278 | ||
279 | setEstateTextureRange(corner, lowValue, highValue); | 279 | setEstateTextureRange(corner, lowValue, highValue); |
280 | } | 280 | } |
@@ -341,10 +341,9 @@ namespace OpenSim.Region.Environment | |||
341 | 341 | ||
342 | public void sendRegionHandshakeToAll() | 342 | public void sendRegionHandshakeToAll() |
343 | { | 343 | { |
344 | m_scene.ForEachScenePresence( delegate( ScenePresence scenePresence ) | 344 | m_scene.Broadcast( |
345 | { | 345 | sendRegionHandshake |
346 | sendRegionHandshake(scenePresence.ControllingClient); | 346 | ); |
347 | }); | ||
348 | } | 347 | } |
349 | 348 | ||
350 | public void sendRegionInfoPacket(IClientAPI remote_client) | 349 | public void sendRegionInfoPacket(IClientAPI remote_client) |
@@ -364,8 +363,8 @@ namespace OpenSim.Region.Environment | |||
364 | regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter; | 363 | regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter; |
365 | regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX; | 364 | regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX; |
366 | regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY; | 365 | regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY; |
367 | regionInfoPacket.RegionInfo.RegionFlags = (uint) m_regInfo.estateSettings.regionFlags; | 366 | regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags; |
368 | regionInfoPacket.RegionInfo.SimAccess = (byte) m_regInfo.estateSettings.simAccess; | 367 | regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess; |
369 | regionInfoPacket.RegionInfo.SimName = _enc.GetBytes(m_regInfo.RegionName); | 368 | regionInfoPacket.RegionInfo.SimName = _enc.GetBytes(m_regInfo.RegionName); |
370 | regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour; | 369 | regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour; |
371 | regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit; | 370 | regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit; |