1 files changed, 79 insertions, 118 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index ccb8163..3d75a8a 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -35,11 +35,6 @@ namespace OpenSim.Framework
    public class InventoryItemBase
    {
        /// <summary>
-        /// A UUID containing the ID for the inventory item itself
-        /// </summary>
-        private LLUUID _id;
-        /// <summary>
        /// The UUID of the associated asset on the asset server
        /// </summary>
        private LLUUID _assetID;
@@ -50,170 +45,136 @@ namespace OpenSim.Framework
        private int _assetType;
        /// <summary>
-        /// The type of inventory item. (Can be slightly different to the asset type
+        /// 
        /// </summary>
-        private int _invType;
+        private uint _basePermissions;
        /// <summary>
-        /// The folder this item is contained in 
+        /// The creator of this item
        /// </summary>
-        private LLUUID _folder;
+        private LLUUID _creator;
        /// <summary>
-        /// The owner of this inventory item
+        /// A mask containing permissions for the current owner (cannot be enforced)
        /// </summary>
-        private LLUUID _owner;
+        private uint _currentPermissions;
        /// <summary>
-        /// The creator of this item
+        /// The description of the inventory item (must be less than 64 characters)
        /// </summary>
-        private LLUUID _creator;
+        private string _description;
        /// <summary>
-        /// The name of the inventory item (must be less than 64 characters)
+        /// 
        /// </summary>
-        private string _name;
+        private uint _everyOnePermissions;
        /// <summary>
-        /// The description of the inventory item (must be less than 64 characters)
+        /// The folder this item is contained in 
        /// </summary>
-        private string _description;
+        private LLUUID _folder;
        /// <summary>
-        /// A mask containing the permissions for the next owner (cannot be enforced)
+        /// A UUID containing the ID for the inventory item itself
        /// </summary>
-        private uint _nextPermissions;
+        private LLUUID _id;
        /// <summary>
-        /// A mask containing permissions for the current owner (cannot be enforced)
+        /// The type of inventory item. (Can be slightly different to the asset type
        /// </summary>
-        private uint _currentPermissions;
+        private int _invType;
        /// <summary>
-        /// 
+        /// The name of the inventory item (must be less than 64 characters)
        /// </summary>
-        private uint _basePermissions;
+        private string _name;
        /// <summary>
-        /// 
+        /// A mask containing the permissions for the next owner (cannot be enforced)
        /// </summary>
-        private uint _everyOnePermissions;
+        private uint _nextPermissions;
-        
-        public LLUUID ID {
+        /// <summary>
-            get {
+        /// The owner of this inventory item
-                return _id;
+        /// </summary>
-            }
+        private LLUUID _owner;
-            set {
-                _id = value;
+        public LLUUID ID
-            }
+        {
+            get { return _id; }
+            set { _id = value; }
        }
-        public int InvType {
+        public int InvType
-            get {
+        {
-                return _invType;
+            get { return _invType; }
-            }
+            set { _invType = value; }
-            set {
-                _invType = value;
-            }
        }
-        public LLUUID Folder {
+        public LLUUID Folder
-            get {
+        {
-                return _folder;
+            get { return _folder; }
-            }
+            set { _folder = value; }
-            set {
-                _folder = value;
-            }
        }
-        public LLUUID Owner {
+        public LLUUID Owner
-            get {
+        {
-                return _owner;
+            get { return _owner; }
-            }
+            set { _owner = value; }
-            set {
-                _owner = value;
-            }
        }
-        public LLUUID Creator {
+        public LLUUID Creator
-            get {
+        {
-                return _creator;
+            get { return _creator; }
-            }
+            set { _creator = value; }
-            set {
-                _creator = value;
-            }
        }
-        public string Name {
+        public string Name
-            get {
+        {
-                return _name;
+            get { return _name; }
-            }
+            set { _name = value; }
-            set {
-                _name = value;
-            }
        }
-        public string Description {
+        public string Description
-            get {
+        {
-                return _description;
+            get { return _description; }
-            }
+            set { _description = value; }
-            set {
-                _description = value;
-            }
        }
-        public uint NextPermissions {
+        public uint NextPermissions
-            get {
+        {
-                return _nextPermissions;
+            get { return _nextPermissions; }
-            }
+            set { _nextPermissions = value; }
-            set {
-                _nextPermissions = value;
-            }
        }
-        public uint CurrentPermissions {
+        public uint CurrentPermissions
-            get {
+        {
-                return _currentPermissions;
+            get { return _currentPermissions; }
-            }
+            set { _currentPermissions = value; }
-            set {
-                _currentPermissions = value;
-            }
        }
-        public uint BasePermissions {
+        public uint BasePermissions
-            get {
+        {
-                return _basePermissions;
+            get { return _basePermissions; }
-            }
+            set { _basePermissions = value; }
-            set {
-                _basePermissions = value;
-            }
        }
-        public uint EveryOnePermissions {
+        public uint EveryOnePermissions
-            get {
+        {
-                return _everyOnePermissions;
+            get { return _everyOnePermissions; }
-            }
+            set { _everyOnePermissions = value; }
-            set {
-                _everyOnePermissions = value;
-            }
        }
-        public int AssetType {
+        public int AssetType
-            get {
+        {
-                return _assetType;
+            get { return _assetType; }
-            }
+            set { _assetType = value; }
-            set {
-                _assetType = value;
-            }
        }
-        public LLUUID AssetID {
+        public LLUUID AssetID
-            get {
+        {
-                return _assetID;
+            get { return _assetID; }
-            }
+            set { _assetID = value; }
-            set {
-                _assetID = value;
-            }
        }
    }
-}
+}
+\ No newline at end of file

diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index ccb8163..3d75a8a 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -35,11 +35,6 @@ namespace OpenSim.Framework
35	public class InventoryItemBase	35	public class InventoryItemBase
36	{	36	{
37	/// <summary>	37	/// <summary>
38	/// A UUID containing the ID for the inventory item itself
39	/// </summary>
40	private LLUUID _id;
41
42	/// <summary>
43	/// The UUID of the associated asset on the asset server	38	/// The UUID of the associated asset on the asset server
44	/// </summary>	39	/// </summary>
45	private LLUUID _assetID;	40	private LLUUID _assetID;
@@ -50,170 +45,136 @@ namespace OpenSim.Framework
50	private int _assetType;	45	private int _assetType;
51		46
52	/// <summary>	47	/// <summary>
53	/// The type of inventory item. (Can be slightly different to the asset type	48	///
54	/// </summary>	49	/// </summary>
55	private int _invType;	50	private uint _basePermissions;
56		51
57	/// <summary>	52	/// <summary>
58	/// The folder this item is contained in	53	/// The creator of this item
59	/// </summary>	54	/// </summary>
60	private LLUUID _folder;	55	private LLUUID _creator;
61		56
62	/// <summary>	57	/// <summary>
63	/// The owner of this inventory item	58	/// A mask containing permissions for the current owner (cannot be enforced)
64	/// </summary>	59	/// </summary>
65	private LLUUID _owner;	60	private uint _currentPermissions;
66		61
67	/// <summary>	62	/// <summary>
68	/// The creator of this item	63	/// The description of the inventory item (must be less than 64 characters)
69	/// </summary>	64	/// </summary>
70	private LLUUID _creator;	65	private string _description;
71		66
72	/// <summary>	67	/// <summary>
73	/// The name of the inventory item (must be less than 64 characters)	68	///
74	/// </summary>	69	/// </summary>
75	private string _name;	70	private uint _everyOnePermissions;
76		71
77	/// <summary>	72	/// <summary>
78	/// The description of the inventory item (must be less than 64 characters)	73	/// The folder this item is contained in
79	/// </summary>	74	/// </summary>
80	private string _description;	75	private LLUUID _folder;
81		76
82	/// <summary>	77	/// <summary>
83	/// A mask containing the permissions for the next owner (cannot be enforced)	78	/// A UUID containing the ID for the inventory item itself
84	/// </summary>	79	/// </summary>
85	private uint _nextPermissions;	80	private LLUUID _id;
86		81
87	/// <summary>	82	/// <summary>
88	/// A mask containing permissions for the current owner (cannot be enforced)	83	/// The type of inventory item. (Can be slightly different to the asset type
89	/// </summary>	84	/// </summary>
90	private uint _currentPermissions;	85	private int _invType;
91		86
92	/// <summary>	87	/// <summary>
93	///	88	/// The name of the inventory item (must be less than 64 characters)
94	/// </summary>	89	/// </summary>
95	private uint _basePermissions;	90	private string _name;
96		91
97	/// <summary>	92	/// <summary>
98	///	93	/// A mask containing the permissions for the next owner (cannot be enforced)
99	/// </summary>	94	/// </summary>
100	private uint _everyOnePermissions;	95	private uint _nextPermissions;
101		96
102	public LLUUID ID {	97	/// <summary>
103	get {	98	/// The owner of this inventory item
104	return _id;	99	/// </summary>
105	}	100	private LLUUID _owner;
106	set {	101
107	_id = value;	102	public LLUUID ID
108	}	103	{
		104	get { return _id; }
		105	set { _id = value; }
109	}	106	}
110		107
111	public int InvType {	108	public int InvType
112	get {	109	{
113	return _invType;	110	get { return _invType; }
114	}	111	set { _invType = value; }
115	set {
116	_invType = value;
117	}
118	}	112	}
119		113
120	public LLUUID Folder {	114	public LLUUID Folder
121	get {	115	{
122	return _folder;	116	get { return _folder; }
123	}	117	set { _folder = value; }
124	set {
125	_folder = value;
126	}
127	}	118	}
128		119
129	public LLUUID Owner {	120	public LLUUID Owner
130	get {	121	{
131	return _owner;	122	get { return _owner; }
132	}	123	set { _owner = value; }
133	set {
134	_owner = value;
135	}
136	}	124	}
137		125
138	public LLUUID Creator {	126	public LLUUID Creator
139	get {	127	{
140	return _creator;	128	get { return _creator; }
141	}	129	set { _creator = value; }
142	set {
143	_creator = value;
144	}
145	}	130	}
146		131
147	public string Name {	132	public string Name
148	get {	133	{
149	return _name;	134	get { return _name; }
150	}	135	set { _name = value; }
151	set {
152	_name = value;
153	}
154	}	136	}
155		137
156	public string Description {	138	public string Description
157	get {	139	{
158	return _description;	140	get { return _description; }
159	}	141	set { _description = value; }
160	set {
161	_description = value;
162	}
163	}	142	}
164		143
165	public uint NextPermissions {	144	public uint NextPermissions
166	get {	145	{
167	return _nextPermissions;	146	get { return _nextPermissions; }
168	}	147	set { _nextPermissions = value; }
169	set {
170	_nextPermissions = value;
171	}
172	}	148	}
173		149
174	public uint CurrentPermissions {	150	public uint CurrentPermissions
175	get {	151	{
176	return _currentPermissions;	152	get { return _currentPermissions; }
177	}	153	set { _currentPermissions = value; }
178	set {
179	_currentPermissions = value;
180	}
181	}	154	}
182		155
183	public uint BasePermissions {	156	public uint BasePermissions
184	get {	157	{
185	return _basePermissions;	158	get { return _basePermissions; }
186	}	159	set { _basePermissions = value; }
187	set {
188	_basePermissions = value;
189	}
190	}	160	}
191		161
192	public uint EveryOnePermissions {	162	public uint EveryOnePermissions
193	get {	163	{
194	return _everyOnePermissions;	164	get { return _everyOnePermissions; }
195	}	165	set { _everyOnePermissions = value; }
196	set {
197	_everyOnePermissions = value;
198	}
199	}	166	}
200		167
201	public int AssetType {	168	public int AssetType
202	get {	169	{
203	return _assetType;	170	get { return _assetType; }
204	}	171	set { _assetType = value; }
205	set {
206	_assetType = value;
207	}
208	}	172	}
209		173
210	public LLUUID AssetID {	174	public LLUUID AssetID
211	get {	175	{
212	return _assetID;	176	get { return _assetID; }
213	}	177	set { _assetID = value; }
214	set {
215	_assetID = value;
216	}
217	}	178	}
218	}	179	}
219	}	180	} \ No newline at end of file