1 files changed, 120 insertions, 120 deletions
diff --git a/OpenSim/Framework/General/Types/LandData.cs b/OpenSim/Framework/General/LandData.cs
index 63c01df..414b613 100644
--- a/OpenSim/Framework/General/Types/LandData.cs
+++ b/OpenSim/Framework/General/LandData.cs
@@ -1,120 +1,120 @@
-/*
+/*
-* 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.Types
+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 | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts | (uint)Parcel.ParcelFlags.SoundLocal ;
+            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 | (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 = this.AABBMax;
+                landData.AABBMax = this.AABBMax;
-                landData.AABBMin = this.AABBMin;
+                landData.AABBMin = this.AABBMin;
-                landData.area = this.area;
+                landData.area = this.area;
-                landData.auctionID = this.auctionID;
+                landData.auctionID = this.auctionID;
-                landData.authBuyerID = this.authBuyerID;
+                landData.authBuyerID = this.authBuyerID;
-                landData.category = this.category;
+                landData.category = this.category;
-                landData.claimDate = this.claimDate;
+                landData.claimDate = this.claimDate;
-                landData.claimPrice = this.claimPrice;
+                landData.claimPrice = this.claimPrice;
-                landData.globalID = this.globalID;
+                landData.globalID = this.globalID;
-                landData.groupID = this.groupID;
+                landData.groupID = this.groupID;
-                landData.groupPrims = this.groupPrims;
+                landData.groupPrims = this.groupPrims;
-                landData.otherPrims = this.otherPrims;
+                landData.otherPrims = this.otherPrims;
-                landData.ownerPrims = this.ownerPrims;
+                landData.ownerPrims = this.ownerPrims;
-                landData.selectedPrims = this.selectedPrims;
+                landData.selectedPrims = this.selectedPrims;
-                landData.isGroupOwned = this.isGroupOwned;
+                landData.isGroupOwned = this.isGroupOwned;
-                landData.localID = this.localID;
+                landData.localID = this.localID;
-                landData.landingType = this.landingType;
+                landData.landingType = this.landingType;
-                landData.mediaAutoScale = this.mediaAutoScale;
+                landData.mediaAutoScale = this.mediaAutoScale;
-                landData.mediaID = this.mediaID;
+                landData.mediaID = this.mediaID;
-                landData.mediaURL = this.mediaURL;
+                landData.mediaURL = this.mediaURL;
-                landData.musicURL = this.musicURL;
+                landData.musicURL = this.musicURL;
-                landData.ownerID = this.ownerID;
+                landData.ownerID = this.ownerID;
-                landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone();
+                landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone();
-                landData.landDesc = this.landDesc;
+                landData.landDesc = this.landDesc;
-                landData.landFlags = this.landFlags;
+                landData.landFlags = this.landFlags;
-                landData.landName = this.landName;
+                landData.landName = this.landName;
-                landData.landStatus = this.landStatus;
+                landData.landStatus = this.landStatus;
-                landData.passHours = this.passHours;
+                landData.passHours = this.passHours;
-                landData.passPrice = this.passPrice;
+                landData.passPrice = this.passPrice;
-                landData.salePrice = this.salePrice;
+                landData.salePrice = this.salePrice;
-                landData.snapshotID = this.snapshotID;
+                landData.snapshotID = this.snapshotID;
-                landData.userLocation = this.userLocation;
+                landData.userLocation = this.userLocation;
-                landData.userLookAt = this.userLookAt;
+                landData.userLookAt = this.userLookAt;
-                return landData;
+                return landData;
-           
+           
-            }
+            }
-        }
+        }
-    
+    
-}
+}

diff --git a/OpenSim/Framework/General/Types/LandData.cs b/OpenSim/Framework/General/LandData.cs index 63c01df..414b613 100644 --- a/OpenSim/Framework/General/Types/LandData.cs +++ b/OpenSim/Framework/General/LandData.cs
@@ -1,120 +1,120 @@
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.Types	30	namespace OpenSim.Framework
31	{	31	{
32		32
33	public class LandData	33	public class LandData
34	{	34	{
35	public byte[] landBitmapByteArray = new byte[512];	35	public byte[] landBitmapByteArray = new byte[512];
36	public string landName = "Your Parcel";	36	public string landName = "Your Parcel";
37	public string landDesc = "";	37	public string landDesc = "";
38	public LLUUID ownerID = new LLUUID();	38	public LLUUID ownerID = new LLUUID();
39	public bool isGroupOwned = false;	39	public bool isGroupOwned = false;
40	public LLVector3 AABBMin = new LLVector3();	40	public LLVector3 AABBMin = new LLVector3();
41	public LLVector3 AABBMax = new LLVector3();	41	public LLVector3 AABBMax = new LLVector3();
42	public int area = 0;	42	public int area = 0;
43	public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned	43	public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
44	public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID	44	public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
45	public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category	45	public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
46	public int claimDate = 0; //Unemplemented	46	public int claimDate = 0; //Unemplemented
47	public int claimPrice = 0; //Unemplemented	47	public int claimPrice = 0; //Unemplemented
48	public LLUUID groupID = new LLUUID(); //Unemplemented	48	public LLUUID groupID = new LLUUID(); //Unemplemented
49	public int groupPrims = 0;	49	public int groupPrims = 0;
50	public int otherPrims = 0;	50	public int otherPrims = 0;
51	public int ownerPrims = 0;	51	public int ownerPrims = 0;
52	public int selectedPrims = 0;	52	public int selectedPrims = 0;
53	public int simwidePrims = 0;	53	public int simwidePrims = 0;
54	public int simwideArea = 0;	54	public int simwideArea = 0;
55	public int salePrice = 0; //Unemeplemented. Parcels price.	55	public int salePrice = 0; //Unemeplemented. Parcels price.
56	public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;	56	public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;
57	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 \| (uint)Parcel.ParcelFlags.SoundLocal ;	57	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 \| (uint)Parcel.ParcelFlags.SoundLocal ;
58	public byte landingType = 0;	58	public byte landingType = 0;
59	public byte mediaAutoScale = 0;	59	public byte mediaAutoScale = 0;
60	public LLUUID mediaID = LLUUID.Zero;	60	public LLUUID mediaID = LLUUID.Zero;
61	public int localID = 0;	61	public int localID = 0;
62	public LLUUID globalID = new LLUUID();	62	public LLUUID globalID = new LLUUID();
63		63
64	public string mediaURL = "";	64	public string mediaURL = "";
65	public string musicURL = "";	65	public string musicURL = "";
66	public float passHours = 0;	66	public float passHours = 0;
67	public int passPrice = 0;	67	public int passPrice = 0;
68	public LLUUID snapshotID = LLUUID.Zero;	68	public LLUUID snapshotID = LLUUID.Zero;
69	public LLVector3 userLocation = new LLVector3();	69	public LLVector3 userLocation = new LLVector3();
70	public LLVector3 userLookAt = new LLVector3();	70	public LLVector3 userLookAt = new LLVector3();
71		71
72	public LandData()	72	public LandData()
73	{	73	{
74	globalID = LLUUID.Random();	74	globalID = LLUUID.Random();
75	}	75	}
76		76
77	public LandData Copy()	77	public LandData Copy()
78	{	78	{
79	LandData landData = new LandData();	79	LandData landData = new LandData();
80		80
81	landData.AABBMax = this.AABBMax;	81	landData.AABBMax = this.AABBMax;
82	landData.AABBMin = this.AABBMin;	82	landData.AABBMin = this.AABBMin;
83	landData.area = this.area;	83	landData.area = this.area;
84	landData.auctionID = this.auctionID;	84	landData.auctionID = this.auctionID;
85	landData.authBuyerID = this.authBuyerID;	85	landData.authBuyerID = this.authBuyerID;
86	landData.category = this.category;	86	landData.category = this.category;
87	landData.claimDate = this.claimDate;	87	landData.claimDate = this.claimDate;
88	landData.claimPrice = this.claimPrice;	88	landData.claimPrice = this.claimPrice;
89	landData.globalID = this.globalID;	89	landData.globalID = this.globalID;
90	landData.groupID = this.groupID;	90	landData.groupID = this.groupID;
91	landData.groupPrims = this.groupPrims;	91	landData.groupPrims = this.groupPrims;
92	landData.otherPrims = this.otherPrims;	92	landData.otherPrims = this.otherPrims;
93	landData.ownerPrims = this.ownerPrims;	93	landData.ownerPrims = this.ownerPrims;
94	landData.selectedPrims = this.selectedPrims;	94	landData.selectedPrims = this.selectedPrims;
95	landData.isGroupOwned = this.isGroupOwned;	95	landData.isGroupOwned = this.isGroupOwned;
96	landData.localID = this.localID;	96	landData.localID = this.localID;
97	landData.landingType = this.landingType;	97	landData.landingType = this.landingType;
98	landData.mediaAutoScale = this.mediaAutoScale;	98	landData.mediaAutoScale = this.mediaAutoScale;
99	landData.mediaID = this.mediaID;	99	landData.mediaID = this.mediaID;
100	landData.mediaURL = this.mediaURL;	100	landData.mediaURL = this.mediaURL;
101	landData.musicURL = this.musicURL;	101	landData.musicURL = this.musicURL;
102	landData.ownerID = this.ownerID;	102	landData.ownerID = this.ownerID;
103	landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone();	103	landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone();
104	landData.landDesc = this.landDesc;	104	landData.landDesc = this.landDesc;
105	landData.landFlags = this.landFlags;	105	landData.landFlags = this.landFlags;
106	landData.landName = this.landName;	106	landData.landName = this.landName;
107	landData.landStatus = this.landStatus;	107	landData.landStatus = this.landStatus;
108	landData.passHours = this.passHours;	108	landData.passHours = this.passHours;
109	landData.passPrice = this.passPrice;	109	landData.passPrice = this.passPrice;
110	landData.salePrice = this.salePrice;	110	landData.salePrice = this.salePrice;
111	landData.snapshotID = this.snapshotID;	111	landData.snapshotID = this.snapshotID;
112	landData.userLocation = this.userLocation;	112	landData.userLocation = this.userLocation;
113	landData.userLookAt = this.userLookAt;	113	landData.userLookAt = this.userLookAt;
114		114
115	return landData;	115	return landData;
116		116
117	}	117	}
118	}	118	}
119		119
120	}	120	}