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

diff --git a/OpenSim/Framework/General/LandData.cs b/OpenSim/Framework/General/LandData.cs index cab71a9..ca948ef 100644 --- a/OpenSim/Framework/General/LandData.cs +++ b/OpenSim/Framework/General/LandData.cs
@@ -1,123 +1,123 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using libsecondlife;	28	using libsecondlife;
29		29
30	namespace OpenSim.Framework	30	namespace OpenSim.Framework
31	{	31	{
32	public class LandData	32	public class LandData
33	{	33	{
34	public byte[] landBitmapByteArray = new byte[512];	34	public byte[] landBitmapByteArray = new byte[512];
35	public string landName = "Your Parcel";	35	public string landName = "Your Parcel";
36	public string landDesc = "";	36	public string landDesc = "";
37	public LLUUID ownerID = new LLUUID();	37	public LLUUID ownerID = new LLUUID();
38	public bool isGroupOwned = false;	38	public bool isGroupOwned = false;
39	public LLVector3 AABBMin = new LLVector3();	39	public LLVector3 AABBMin = new LLVector3();
40	public LLVector3 AABBMax = new LLVector3();	40	public LLVector3 AABBMax = new LLVector3();
41	public int area = 0;	41	public int area = 0;
42	public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned	42	public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
43	public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID	43	public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
44	public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category	44	public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
45	public int claimDate = 0; //Unemplemented	45	public int claimDate = 0; //Unemplemented
46	public int claimPrice = 0; //Unemplemented	46	public int claimPrice = 0; //Unemplemented
47	public LLUUID groupID = new LLUUID(); //Unemplemented	47	public LLUUID groupID = new LLUUID(); //Unemplemented
48	public int groupPrims = 0;	48	public int groupPrims = 0;
49	public int otherPrims = 0;	49	public int otherPrims = 0;
50	public int ownerPrims = 0;	50	public int ownerPrims = 0;
51	public int selectedPrims = 0;	51	public int selectedPrims = 0;
52	public int simwidePrims = 0;	52	public int simwidePrims = 0;
53	public int simwideArea = 0;	53	public int simwideArea = 0;
54	public int salePrice = 0; //Unemeplemented. Parcels price.	54	public int salePrice = 0; //Unemeplemented. Parcels price.
55	public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;	55	public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;
56		56
57	public uint landFlags = (uint) Parcel.ParcelFlags.AllowFly \| (uint) Parcel.ParcelFlags.AllowLandmark \|	57	public uint landFlags = (uint) Parcel.ParcelFlags.AllowFly \| (uint) Parcel.ParcelFlags.AllowLandmark \|
58	(uint) Parcel.ParcelFlags.AllowAllObjectEntry \|	58	(uint) Parcel.ParcelFlags.AllowAllObjectEntry \|
59	(uint) Parcel.ParcelFlags.AllowDeedToGroup \| (uint) Parcel.ParcelFlags.AllowTerraform \|	59	(uint) Parcel.ParcelFlags.AllowDeedToGroup \| (uint) Parcel.ParcelFlags.AllowTerraform \|
60	(uint) Parcel.ParcelFlags.CreateObjects \| (uint) Parcel.ParcelFlags.AllowOtherScripts \|	60	(uint) Parcel.ParcelFlags.CreateObjects \| (uint) Parcel.ParcelFlags.AllowOtherScripts \|
61	(uint) Parcel.ParcelFlags.SoundLocal;	61	(uint) Parcel.ParcelFlags.SoundLocal;
62		62
63	public byte landingType = 0;	63	public byte landingType = 0;
64	public byte mediaAutoScale = 0;	64	public byte mediaAutoScale = 0;
65	public LLUUID mediaID = LLUUID.Zero;	65	public LLUUID mediaID = LLUUID.Zero;
66	public int localID = 0;	66	public int localID = 0;
67	public LLUUID globalID = new LLUUID();	67	public LLUUID globalID = new LLUUID();
68		68
69	public string mediaURL = "";	69	public string mediaURL = "";
70	public string musicURL = "";	70	public string musicURL = "";
71	public float passHours = 0;	71	public float passHours = 0;
72	public int passPrice = 0;	72	public int passPrice = 0;
73	public LLUUID snapshotID = LLUUID.Zero;	73	public LLUUID snapshotID = LLUUID.Zero;
74	public LLVector3 userLocation = new LLVector3();	74	public LLVector3 userLocation = new LLVector3();
75	public LLVector3 userLookAt = new LLVector3();	75	public LLVector3 userLookAt = new LLVector3();
76		76
77	public LandData()	77	public LandData()
78	{	78	{
79	globalID = LLUUID.Random();	79	globalID = LLUUID.Random();
80	}	80	}
81		81
82	public LandData Copy()	82	public LandData Copy()
83	{	83	{
84	LandData landData = new LandData();	84	LandData landData = new LandData();
85		85
86	landData.AABBMax = AABBMax;	86	landData.AABBMax = AABBMax;
87	landData.AABBMin = AABBMin;	87	landData.AABBMin = AABBMin;
88	landData.area = area;	88	landData.area = area;
89	landData.auctionID = auctionID;	89	landData.auctionID = auctionID;
90	landData.authBuyerID = authBuyerID;	90	landData.authBuyerID = authBuyerID;
91	landData.category = category;	91	landData.category = category;
92	landData.claimDate = claimDate;	92	landData.claimDate = claimDate;
93	landData.claimPrice = claimPrice;	93	landData.claimPrice = claimPrice;
94	landData.globalID = globalID;	94	landData.globalID = globalID;
95	landData.groupID = groupID;	95	landData.groupID = groupID;
96	landData.groupPrims = groupPrims;	96	landData.groupPrims = groupPrims;
97	landData.otherPrims = otherPrims;	97	landData.otherPrims = otherPrims;
98	landData.ownerPrims = ownerPrims;	98	landData.ownerPrims = ownerPrims;
99	landData.selectedPrims = selectedPrims;	99	landData.selectedPrims = selectedPrims;
100	landData.isGroupOwned = isGroupOwned;	100	landData.isGroupOwned = isGroupOwned;
101	landData.localID = localID;	101	landData.localID = localID;
102	landData.landingType = landingType;	102	landData.landingType = landingType;
103	landData.mediaAutoScale = mediaAutoScale;	103	landData.mediaAutoScale = mediaAutoScale;
104	landData.mediaID = mediaID;	104	landData.mediaID = mediaID;
105	landData.mediaURL = mediaURL;	105	landData.mediaURL = mediaURL;
106	landData.musicURL = musicURL;	106	landData.musicURL = musicURL;
107	landData.ownerID = ownerID;	107	landData.ownerID = ownerID;
108	landData.landBitmapByteArray = (byte[]) landBitmapByteArray.Clone();	108	landData.landBitmapByteArray = (byte[]) landBitmapByteArray.Clone();
109	landData.landDesc = landDesc;	109	landData.landDesc = landDesc;
110	landData.landFlags = landFlags;	110	landData.landFlags = landFlags;
111	landData.landName = landName;	111	landData.landName = landName;
112	landData.landStatus = landStatus;	112	landData.landStatus = landStatus;
113	landData.passHours = passHours;	113	landData.passHours = passHours;
114	landData.passPrice = passPrice;	114	landData.passPrice = passPrice;
115	landData.salePrice = salePrice;	115	landData.salePrice = salePrice;
116	landData.snapshotID = snapshotID;	116	landData.snapshotID = snapshotID;
117	landData.userLocation = userLocation;	117	landData.userLocation = userLocation;
118	landData.userLookAt = userLookAt;	118	landData.userLookAt = userLookAt;
119		119
120	return landData;	120	return landData;
121	}	121	}
122	}	122	}
123	} \ No newline at end of file	123	} \ No newline at end of file