aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/ParcelManager.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/ParcelManager.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 3afbe6e..2059b3f 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -27,7 +27,6 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 30using libsecondlife;
32using libsecondlife.Packets; 31using libsecondlife.Packets;
33using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
@@ -43,7 +42,7 @@ namespace OpenSim.Region.Environment
43 /// <summary> 42 /// <summary>
44 /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc) 43 /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
45 /// </summary> 44 /// </summary>
46 public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver 45 public class ParcelManager : ILocalStorageParcelReceiver
47 { 46 {
48 47
49 #region Constants 48 #region Constants
@@ -420,7 +419,7 @@ namespace OpenSim.Region.Environment
420 { 419 {
421 for (y = 0; y < inc_y; y++) 420 for (y = 0; y < inc_y; y++)
422 { 421 {
423 OpenSim.Region.Environment.Parcel currentParcel = getParcel(start_x + x, start_y + y); 422 Parcel currentParcel = getParcel(start_x + x, start_y + y);
424 if (!temp.Contains(currentParcel)) 423 if (!temp.Contains(currentParcel))
425 { 424 {
426 currentParcel.forceUpdateParcelInfo(); 425 currentParcel.forceUpdateParcelInfo();
@@ -429,10 +428,10 @@ namespace OpenSim.Region.Environment
429 } 428 }
430 } 429 }
431 430
432 int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL; 431 int requestResult = PARCEL_RESULT_ONE_PARCEL;
433 if (temp.Count > 1) 432 if (temp.Count > 1)
434 { 433 {
435 requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS; 434 requestResult = PARCEL_RESULT_MULTIPLE_PARCELS;
436 } 435 }
437 436
438 for (i = 0; i < temp.Count; i++) 437 for (i = 0; i < temp.Count; i++)
@@ -571,7 +570,7 @@ namespace OpenSim.Region.Environment
571 570
572 updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray; 571 updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
573 572
574 updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc); 573 updatePacket.ParcelData.Desc = Helpers.StringToField(parcelData.parcelDesc);
575 updatePacket.ParcelData.Category = (byte)parcelData.category; 574 updatePacket.ParcelData.Category = (byte)parcelData.category;
576 updatePacket.ParcelData.ClaimDate = parcelData.claimDate; 575 updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
577 updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice; 576 updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
@@ -631,7 +630,7 @@ namespace OpenSim.Region.Environment
631 parcelData.mediaID = packet.ParcelData.MediaID; 630 parcelData.mediaID = packet.ParcelData.MediaID;
632 parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL); 631 parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
633 parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL); 632 parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
634 parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name); 633 parcelData.parcelName = Helpers.FieldToUTF8String(packet.ParcelData.Name);
635 parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags; 634 parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
636 parcelData.passHours = packet.ParcelData.PassHours; 635 parcelData.passHours = packet.ParcelData.PassHours;
637 parcelData.passPrice = packet.ParcelData.PassPrice; 636 parcelData.passPrice = packet.ParcelData.PassPrice;