diff options
| author | Adam Frisby | 2007-07-13 20:01:16 +0000 |
|---|---|---|
| committer | Adam Frisby | 2007-07-13 20:01:16 +0000 |
| commit | ad264a6b6dbb92a48bb744936a2f3967fb637730 (patch) | |
| tree | 40b8d4f15781cdc4142722140d3936492cbecbd6 /OpenSim/Region | |
| parent | * Default parcel flags now allow flying, landmark creation, object entry, dee... (diff) | |
| download | opensim-SC_OLD-ad264a6b6dbb92a48bb744936a2f3967fb637730.zip opensim-SC_OLD-ad264a6b6dbb92a48bb744936a2f3967fb637730.tar.gz opensim-SC_OLD-ad264a6b6dbb92a48bb744936a2f3967fb637730.tar.bz2 opensim-SC_OLD-ad264a6b6dbb92a48bb744936a2f3967fb637730.tar.xz | |
* Fixing issue with ParcelFlags. ParcelFlags is now a uint rather than an enum.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/ParcelManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs index 5e7ee18..1e55633 100644 --- a/OpenSim/Region/Environment/ParcelManager.cs +++ b/OpenSim/Region/Environment/ParcelManager.cs | |||
| @@ -478,7 +478,7 @@ namespace OpenSim.Region.Environment | |||
| 478 | 478 | ||
| 479 | fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID; | 479 | fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID; |
| 480 | fullSimParcel.parcelData.salePrice = 1; | 480 | fullSimParcel.parcelData.salePrice = 1; |
| 481 | fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale; | 481 | fullSimParcel.parcelData.parcelFlags |= (uint)libsecondlife.Parcel.ParcelFlags.ForSale; |
| 482 | fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased; | 482 | fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased; |
| 483 | 483 | ||
| 484 | addParcel(fullSimParcel); | 484 | addParcel(fullSimParcel); |
| @@ -603,7 +603,7 @@ namespace OpenSim.Region.Environment | |||
| 603 | updatePacket.ParcelData.OtherPrims = 0; //unemplented | 603 | updatePacket.ParcelData.OtherPrims = 0; //unemplented |
| 604 | updatePacket.ParcelData.OwnerID = parcelData.ownerID; | 604 | updatePacket.ParcelData.OwnerID = parcelData.ownerID; |
| 605 | updatePacket.ParcelData.OwnerPrims = 0; //unemplemented | 605 | updatePacket.ParcelData.OwnerPrims = 0; //unemplemented |
| 606 | updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented | 606 | updatePacket.ParcelData.ParcelFlags = parcelData.parcelFlags; //unemplemented |
| 607 | updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented | 607 | updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented |
| 608 | updatePacket.ParcelData.PassHours = parcelData.passHours; | 608 | updatePacket.ParcelData.PassHours = parcelData.passHours; |
| 609 | updatePacket.ParcelData.PassPrice = parcelData.passPrice; | 609 | updatePacket.ParcelData.PassPrice = parcelData.passPrice; |
| @@ -644,7 +644,7 @@ namespace OpenSim.Region.Environment | |||
| 644 | parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL); | 644 | parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL); |
| 645 | parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL); | 645 | parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL); |
| 646 | parcelData.parcelName = Helpers.FieldToUTF8String(packet.ParcelData.Name); | 646 | parcelData.parcelName = Helpers.FieldToUTF8String(packet.ParcelData.Name); |
| 647 | parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags; | 647 | parcelData.parcelFlags = packet.ParcelData.ParcelFlags; |
| 648 | parcelData.passHours = packet.ParcelData.PassHours; | 648 | parcelData.passHours = packet.ParcelData.PassHours; |
| 649 | parcelData.passPrice = packet.ParcelData.PassPrice; | 649 | parcelData.passPrice = packet.ParcelData.PassPrice; |
| 650 | parcelData.salePrice = packet.ParcelData.SalePrice; | 650 | parcelData.salePrice = packet.ParcelData.SalePrice; |