From 93c36b8865915aed764eeaf2a4931ec26baf1c99 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Fri, 8 Jun 2007 17:09:51 +0000
Subject: *Added EstateSettings.cs and ParcelData.cs to OpenSim.Framework.Types
---
Common/OpenSim.Framework/OpenSim.Framework.csproj | 82 ++++++++-------
.../OpenSim.Framework/OpenSim.Framework.dll.build | 60 ++++++-----
Common/OpenSim.Framework/Types/EstateSettings.cs | 96 +++++++++++++++++
Common/OpenSim.Framework/Types/ParcelData.cs | 115 +++++++++++++++++++++
4 files changed, 292 insertions(+), 61 deletions(-)
create mode 100644 Common/OpenSim.Framework/Types/EstateSettings.cs
create mode 100644 Common/OpenSim.Framework/Types/ParcelData.cs
(limited to 'Common/OpenSim.Framework')
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index e2a850f..39ce0ff 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -90,48 +90,60 @@
+
+ Code
+
Code
Code
-
+
Code
-
+
+ Code
+
+
Code
Code
-
+
Code
-
+
Code
-
+
+ Code
+
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
+
+ Code
+
Code
@@ -141,85 +153,79 @@
Code
-
- Code
-
-
- Code
-
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 34be1c8..a75388f 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,39 +11,52 @@
+
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -55,6 +68,7 @@
+
diff --git a/Common/OpenSim.Framework/Types/EstateSettings.cs b/Common/OpenSim.Framework/Types/EstateSettings.cs
new file mode 100644
index 0000000..baa3eef
--- /dev/null
+++ b/Common/OpenSim.Framework/Types/EstateSettings.cs
@@ -0,0 +1,96 @@
+/*
+* 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 System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+ public class EstateSettings
+ {
+ //Settings to this island
+ public float billableFactor = (float)0.0;
+ public uint estateID = 0;
+ public uint parentEstateID = 0;
+
+ public byte maxAgents = 40;
+ public float objectBonusFactor = (float)1.0;
+
+ public int redirectGridX = 0; //??
+ public int redirectGridY = 0; //??
+ public libsecondlife.Simulator.RegionFlags regionFlags = libsecondlife.Simulator.RegionFlags.None; //Booleam values of various region settings
+ public libsecondlife.Simulator.SimAccess simAccess = libsecondlife.Simulator.SimAccess.Mature; //Is sim PG, Mature, etc? Mature by default.
+ public float sunHour = 0;
+
+ public float terrainRaiseLimit = 0;
+ public float terrainLowerLimit = 0;
+
+ public bool useFixedSun = false;
+ public int pricePerMeter = 1;
+
+ public ushort regionWaterHeight = 20;
+ public bool regionAllowTerraform = true;
+
+ // Region Information
+ // Low resolution 'base' textures. No longer used.
+ public LLUUID terrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default
+ public LLUUID terrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default
+ public LLUUID terrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default
+ public LLUUID terrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default
+
+ // Higher resolution terrain textures
+ public LLUUID terrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
+ public LLUUID terrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
+ public LLUUID terrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
+ public LLUUID terrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
+
+ // First quad - each point is bilinearly interpolated at each meter of terrain
+ public float terrainStartHeight0 = 10.0f;
+ public float terrainStartHeight1 = 10.0f;
+ public float terrainStartHeight2 = 10.0f;
+ public float terrainStartHeight3 = 10.0f;
+
+ // Second quad - also bilinearly interpolated.
+ // Terrain texturing is done that:
+ // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
+ public float terrainHeightRange0 = 60.0f; //00
+ public float terrainHeightRange1 = 60.0f; //01
+ public float terrainHeightRange2 = 60.0f; //10
+ public float terrainHeightRange3 = 60.0f; //11
+
+ // Terrain Default (Must be in F32 Format!)
+ public string terrainFile = "default.r32";
+ public double terrainMultiplier = 60.0;
+ public float waterHeight = (float)20.0;
+
+
+ }
+}
diff --git a/Common/OpenSim.Framework/Types/ParcelData.cs b/Common/OpenSim.Framework/Types/ParcelData.cs
new file mode 100644
index 0000000..40f128a
--- /dev/null
+++ b/Common/OpenSim.Framework/Types/ParcelData.cs
@@ -0,0 +1,115 @@
+/*
+* 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 System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Framework.Types
+{
+
+ public class ParcelData
+ {
+ public byte[] parcelBitmapByteArray = new byte[512];
+ public string parcelName = "";
+ 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 libsecondlife.Parcel.ParcelCategory category = new libsecondlife.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; //Unemplemented
+ public int salePrice = 0; //Unemeplemented. Parcels price.
+ public libsecondlife.Parcel.ParcelStatus parcelStatus = libsecondlife.Parcel.ParcelStatus.None;
+ public libsecondlife.Parcel.ParcelFlags parcelFlags = libsecondlife.Parcel.ParcelFlags.None;
+ 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.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;
+
+ }
+ }
+
+}
--
cgit v1.1