diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Region/Environment/EstateManager.cs | |
parent | * removed always true if (diff) | |
download | opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/EstateManager.cs | 24 |
1 files changed, 13 insertions, 11 deletions
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 | |||
334 | } | 334 | } |
335 | } | 335 | } |
336 | } | 336 | } |
337 | |||
337 | private void estateRestartSim(EstateOwnerMessagePacket packet) | 338 | private void estateRestartSim(EstateOwnerMessagePacket packet) |
338 | { | 339 | { |
339 | // There's only 1 block in the estateResetSim.. and that's the number of seconds till restart. | 340 | // 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 | |||
341 | { | 342 | { |
342 | float timeSeconds = 0; | 343 | float timeSeconds = 0; |
343 | timeSeconds = BitConverter.ToInt16(block.Parameter, 1); | 344 | timeSeconds = BitConverter.ToInt16(block.Parameter, 1); |
344 | timeSeconds = (int)((timeSeconds / 100) - 3); | 345 | timeSeconds = (int) ((timeSeconds/100) - 3); |
345 | m_scene.Restart(timeSeconds); | 346 | m_scene.Restart(timeSeconds); |
346 | |||
347 | } | 347 | } |
348 | } | 348 | } |
349 | |||
349 | private void EstateChangeCovenant(EstateOwnerMessagePacket packet) | 350 | private void EstateChangeCovenant(EstateOwnerMessagePacket packet) |
350 | { | 351 | { |
351 | foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList) | 352 | foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList) |
352 | { | 353 | { |
353 | LLUUID newCovenantID = new LLUUID(Helpers.FieldToUTF8String(block.Parameter)); | 354 | LLUUID newCovenantID = new LLUUID(Helpers.FieldToUTF8String(block.Parameter)); |
354 | m_regInfo.CovenantID = newCovenantID; | 355 | m_regInfo.CovenantID = newCovenantID; |
355 | |||
356 | } | 356 | } |
357 | |||
358 | } | 357 | } |
358 | |||
359 | public void HandleRegionInfoRequest(IClientAPI client, LLUUID sessionID) | 359 | public void HandleRegionInfoRequest(IClientAPI client, LLUUID sessionID) |
360 | { | 360 | { |
361 | RegionInfoPacket rinfopack = new RegionInfoPacket(); | 361 | RegionInfoPacket rinfopack = new RegionInfoPacket(); |
362 | RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); | 362 | RegionInfoPacket.RegionInfoBlock rinfoblk = new RegionInfoPacket.RegionInfoBlock(); |
363 | 363 | ||
364 | rinfoblk.BillableFactor = 0; | 364 | rinfoblk.BillableFactor = 0; |
365 | rinfoblk.EstateID = 02; | 365 | rinfoblk.EstateID = 02; |
366 | rinfoblk.MaxAgents = 100; | 366 | rinfoblk.MaxAgents = 100; |
@@ -369,20 +369,20 @@ namespace OpenSim.Region.Environment | |||
369 | rinfoblk.PricePerMeter = 0; | 369 | rinfoblk.PricePerMeter = 0; |
370 | rinfoblk.RedirectGridX = 0; | 370 | rinfoblk.RedirectGridX = 0; |
371 | rinfoblk.RedirectGridY = 0; | 371 | rinfoblk.RedirectGridY = 0; |
372 | rinfoblk.RegionFlags = (uint)m_regInfo.EstateSettings.regionFlags; | 372 | rinfoblk.RegionFlags = (uint) m_regInfo.EstateSettings.regionFlags; |
373 | rinfoblk.SimAccess = (byte)m_regInfo.EstateSettings.simAccess; | 373 | rinfoblk.SimAccess = (byte) m_regInfo.EstateSettings.simAccess; |
374 | rinfoblk.SunHour = m_regInfo.EstateSettings.sunHour; | 374 | rinfoblk.SunHour = m_regInfo.EstateSettings.sunHour; |
375 | rinfoblk.TerrainLowerLimit = 20; | 375 | rinfoblk.TerrainLowerLimit = 20; |
376 | rinfoblk.TerrainRaiseLimit = 20; | 376 | rinfoblk.TerrainRaiseLimit = 20; |
377 | rinfoblk.UseEstateSun = true; | 377 | rinfoblk.UseEstateSun = true; |
378 | rinfoblk.WaterHeight = m_regInfo.EstateSettings.waterHeight; | 378 | rinfoblk.WaterHeight = m_regInfo.EstateSettings.waterHeight; |
379 | rinfoblk.SimName = Helpers.StringToField(m_regInfo.RegionName); | 379 | rinfoblk.SimName = Helpers.StringToField(m_regInfo.RegionName); |
380 | 380 | ||
381 | rinfopack.RegionInfo = rinfoblk; | 381 | rinfopack.RegionInfo = rinfoblk; |
382 | 382 | ||
383 | client.OutPacket(rinfopack, ThrottleOutPacketType.Task); | 383 | client.OutPacket(rinfopack, ThrottleOutPacketType.Task); |
384 | |||
385 | } | 384 | } |
385 | |||
386 | public void HandleEstateCovenantRequest(IClientAPI client, LLUUID sessionID) | 386 | public void HandleEstateCovenantRequest(IClientAPI client, LLUUID sessionID) |
387 | { | 387 | { |
388 | EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); | 388 | EstateCovenantReplyPacket einfopack = new EstateCovenantReplyPacket(); |
@@ -390,10 +390,12 @@ namespace OpenSim.Region.Environment | |||
390 | edata.CovenantID = m_regInfo.CovenantID; | 390 | edata.CovenantID = m_regInfo.CovenantID; |
391 | edata.CovenantTimestamp = 0; | 391 | edata.CovenantTimestamp = 0; |
392 | edata.EstateOwnerID = m_regInfo.MasterAvatarAssignedUUID; | 392 | edata.EstateOwnerID = m_regInfo.MasterAvatarAssignedUUID; |
393 | edata.EstateName = Helpers.StringToField(m_regInfo.MasterAvatarFirstName + " " + m_regInfo.MasterAvatarLastName); | 393 | edata.EstateName = |
394 | Helpers.StringToField(m_regInfo.MasterAvatarFirstName + " " + m_regInfo.MasterAvatarLastName); | ||
394 | einfopack.Data = edata; | 395 | einfopack.Data = edata; |
395 | client.OutPacket(einfopack, ThrottleOutPacketType.Task); | 396 | client.OutPacket(einfopack, ThrottleOutPacketType.Task); |
396 | } | 397 | } |
398 | |||
397 | #endregion | 399 | #endregion |
398 | 400 | ||
399 | #region Outgoing Packets | 401 | #region Outgoing Packets |
@@ -451,4 +453,4 @@ namespace OpenSim.Region.Environment | |||
451 | 453 | ||
452 | #endregion | 454 | #endregion |
453 | } | 455 | } |
454 | } | 456 | } \ No newline at end of file |