ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Renamed everything Parcels and ParcelData to Land and LandData

Browse Source 
*Added missing files (I hope)
This commit is contained in:
mingchen
2007-07-16 19:40:25 +00:00
parent 7fabf9612a
commit 2873b82b78
16 changed files with 274 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@@ -71,7 +71,7 @@ namespace OpenSim.Framework.Interfaces
public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);
public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);
public delegate void ParcelSelectObjects(int parcel_local_id, int request_type, IClientAPI remote_client);
public delegate void ParcelSelectObjects(int land_local_id, int request_type, IClientAPI remote_client);
public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client);
public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);

16
OpenSim/Framework/General/Interfaces/ILocalStorage.cs
View File

@@ -48,11 +48,11 @@ namespace OpenSim.Framework.Interfaces
[System.Obsolete("Use DataStorage instead")]
void SaveMap(float[] heightmap);
void SaveParcels(ParcelData[] parcels);
void SaveParcel(ParcelData parcel);
void RemoveParcel(ParcelData parcel);
void RemoveAllParcels();
void LoadParcels(ILocalStorageParcelReceiver recv);
void SaveLandObjects(LandData[] lands);
void SaveLandObject(LandData land);
void RemoveLandObject(LandData land);
void RemoveAllLandObjects();
void LoadLandObjects(ILocalStorageLandObjectReceiver recv);
void ShutDown();
}
@@ -62,10 +62,10 @@ namespace OpenSim.Framework.Interfaces
void PrimFromStorage(PrimData prim);
}
public interface ILocalStorageParcelReceiver
public interface ILocalStorageLandObjectReceiver
{
void ParcelFromStorage(ParcelData data);
void NoParcelDataFromStorage();
void LandFromStorage(LandData data);
void NoLandDataFromStorage();
}
}

240
OpenSim/Framework/General/Types/ParcelData.cs → OpenSim/Framework/General/Types/LandData.cs
View File

@@ -1,120 +1,120 @@
/*
* Copyright (c) Contributors, http://www.openmetaverse.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using libsecondlife;
namespace OpenSim.Framework.Types
{
public class ParcelData
{
public byte[] parcelBitmapByteArray = new byte[512];
public string parcelName = "Your Parcel";
public string parcelDesc = "";
public LLUUID ownerID = new LLUUID();
public bool isGroupOwned = false;
public LLVector3 AABBMin = new LLVector3();
public LLVector3 AABBMax = new LLVector3();
public int area = 0;
public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
public int claimDate = 0; //Unemplemented
public int claimPrice = 0; //Unemplemented
public LLUUID groupID = new LLUUID(); //Unemplemented
public int groupPrims = 0;
public int otherPrims = 0;
public int ownerPrims = 0;
public int selectedPrims = 0;
public int simwidePrims = 0;
public int simwideArea = 0;
public int salePrice = 0; //Unemeplemented. Parcels price.
public Parcel.ParcelStatus parcelStatus = Parcel.ParcelStatus.Leased;
public uint parcelFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts;
public byte landingType = 0;
public byte mediaAutoScale = 0;
public LLUUID mediaID = LLUUID.Zero;
public int localID = 0;
public LLUUID globalID = new LLUUID();
public string mediaURL = "";
public string musicURL = "";
public float passHours = 0;
public int passPrice = 0;
public LLUUID snapshotID = LLUUID.Zero;
public LLVector3 userLocation = new LLVector3();
public LLVector3 userLookAt = new LLVector3();
public ParcelData()
{
globalID = LLUUID.Random();
}
public ParcelData Copy()
{
ParcelData parcelData = new ParcelData();
parcelData.AABBMax = this.AABBMax;
parcelData.AABBMin = this.AABBMin;
parcelData.area = this.area;
parcelData.auctionID = this.auctionID;
parcelData.authBuyerID = this.authBuyerID;
parcelData.category = this.category;
parcelData.claimDate = this.claimDate;
parcelData.claimPrice = this.claimPrice;
parcelData.globalID = this.globalID;
parcelData.groupID = this.groupID;
parcelData.groupPrims = this.groupPrims;
parcelData.otherPrims = this.otherPrims;
parcelData.ownerPrims = this.ownerPrims;
parcelData.selectedPrims = this.selectedPrims;
parcelData.isGroupOwned = this.isGroupOwned;
parcelData.localID = this.localID;
parcelData.landingType = this.landingType;
parcelData.mediaAutoScale = this.mediaAutoScale;
parcelData.mediaID = this.mediaID;
parcelData.mediaURL = this.mediaURL;
parcelData.musicURL = this.musicURL;
parcelData.ownerID = this.ownerID;
parcelData.parcelBitmapByteArray = (byte[])this.parcelBitmapByteArray.Clone();
parcelData.parcelDesc = this.parcelDesc;
parcelData.parcelFlags = this.parcelFlags;
parcelData.parcelName = this.parcelName;
parcelData.parcelStatus = this.parcelStatus;
parcelData.passHours = this.passHours;
parcelData.passPrice = this.passPrice;
parcelData.salePrice = this.salePrice;
parcelData.snapshotID = this.snapshotID;
parcelData.userLocation = this.userLocation;
parcelData.userLookAt = this.userLookAt;
return parcelData;
}
}
}
/*
* Copyright (c) Contributors, http://www.openmetaverse.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using libsecondlife;
namespace OpenSim.Framework.Types
{
public class LandData
{
public byte[] landBitmapByteArray = new byte[512];
public string landName = "Your Parcel";
public string landDesc = "";
public LLUUID ownerID = new LLUUID();
public bool isGroupOwned = false;
public LLVector3 AABBMin = new LLVector3();
public LLVector3 AABBMax = new LLVector3();
public int area = 0;
public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
public int claimDate = 0; //Unemplemented
public int claimPrice = 0; //Unemplemented
public LLUUID groupID = new LLUUID(); //Unemplemented
public int groupPrims = 0;
public int otherPrims = 0;
public int ownerPrims = 0;
public int selectedPrims = 0;
public int simwidePrims = 0;
public int simwideArea = 0;
public int salePrice = 0; //Unemeplemented. Parcels price.
public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;
public uint landFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts;
public byte landingType = 0;
public byte mediaAutoScale = 0;
public LLUUID mediaID = LLUUID.Zero;
public int localID = 0;
public LLUUID globalID = new LLUUID();
public string mediaURL = "";
public string musicURL = "";
public float passHours = 0;
public int passPrice = 0;
public LLUUID snapshotID = LLUUID.Zero;
public LLVector3 userLocation = new LLVector3();
public LLVector3 userLookAt = new LLVector3();
public LandData()
{
globalID = LLUUID.Random();
}
public LandData Copy()
{
LandData landData = new LandData();
landData.AABBMax = this.AABBMax;
landData.AABBMin = this.AABBMin;
landData.area = this.area;
landData.auctionID = this.auctionID;
landData.authBuyerID = this.authBuyerID;
landData.category = this.category;
landData.claimDate = this.claimDate;
landData.claimPrice = this.claimPrice;
landData.globalID = this.globalID;
landData.groupID = this.groupID;
landData.groupPrims = this.groupPrims;
landData.otherPrims = this.otherPrims;
landData.ownerPrims = this.ownerPrims;
landData.selectedPrims = this.selectedPrims;
landData.isGroupOwned = this.isGroupOwned;
landData.localID = this.localID;
landData.landingType = this.landingType;
landData.mediaAutoScale = this.mediaAutoScale;
landData.mediaID = this.mediaID;
landData.mediaURL = this.mediaURL;
landData.musicURL = this.musicURL;
landData.ownerID = this.ownerID;
landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone();
landData.landDesc = this.landDesc;
landData.landFlags = this.landFlags;
landData.landName = this.landName;
landData.landStatus = this.landStatus;
landData.passHours = this.passHours;
landData.passPrice = this.passPrice;
landData.salePrice = this.salePrice;
landData.snapshotID = this.snapshotID;
landData.userLocation = this.userLocation;
landData.userLookAt = this.userLookAt;
return landData;
}
}
}