diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/LandData.cs | 385 |
1 files changed, 125 insertions, 260 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 4dffd3f..dcaa46d 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs | |||
@@ -49,8 +49,8 @@ namespace OpenSim.Framework | |||
49 | // use only one serializer to give the runtime a chance to | 49 | // use only one serializer to give the runtime a chance to |
50 | // optimize it (it won't do that if you use a new instance | 50 | // optimize it (it won't do that if you use a new instance |
51 | // every time) | 51 | // every time) |
52 | private static XmlSerializer serializer = new XmlSerializer(typeof(LandData)); | 52 | private static XmlSerializer serializer = new XmlSerializer(typeof (LandData)); |
53 | 53 | ||
54 | private Vector3 _AABBMax = new Vector3(); | 54 | private Vector3 _AABBMax = new Vector3(); |
55 | private Vector3 _AABBMin = new Vector3(); | 55 | private Vector3 _AABBMin = new Vector3(); |
56 | private int _area = 0; | 56 | private int _area = 0; |
@@ -65,11 +65,11 @@ namespace OpenSim.Framework | |||
65 | private byte[] _bitmap = new byte[512]; | 65 | private byte[] _bitmap = new byte[512]; |
66 | private string _description = String.Empty; | 66 | private string _description = String.Empty; |
67 | 67 | ||
68 | private uint _flags = (uint)ParcelFlags.AllowFly | (uint)ParcelFlags.AllowLandmark | | 68 | private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark | |
69 | (uint)ParcelFlags.AllowAPrimitiveEntry | | 69 | (uint) ParcelFlags.AllowAPrimitiveEntry | |
70 | (uint)ParcelFlags.AllowDeedToGroup | | 70 | (uint) ParcelFlags.AllowDeedToGroup | |
71 | (uint)ParcelFlags.CreateObjects | (uint)ParcelFlags.AllowOtherScripts | | 71 | (uint) ParcelFlags.CreateObjects | (uint) ParcelFlags.AllowOtherScripts | |
72 | (uint)ParcelFlags.AllowVoiceChat; | 72 | (uint) ParcelFlags.SoundLocal | (uint) ParcelFlags.AllowVoiceChat; |
73 | 73 | ||
74 | private byte _landingType = 0; | 74 | private byte _landingType = 0; |
75 | private string _name = "Your Parcel"; | 75 | private string _name = "Your Parcel"; |
@@ -97,36 +97,16 @@ namespace OpenSim.Framework | |||
97 | private bool _mediaLoop = false; | 97 | private bool _mediaLoop = false; |
98 | private bool _obscureMusic = false; | 98 | private bool _obscureMusic = false; |
99 | private bool _obscureMedia = false; | 99 | private bool _obscureMedia = false; |
100 | private float _dwell = 0; | ||
101 | |||
102 | /// <summary> | ||
103 | /// Traffic count of parcel | ||
104 | /// </summary> | ||
105 | [XmlIgnore] | ||
106 | public float Dwell | ||
107 | { | ||
108 | get | ||
109 | { | ||
110 | return _dwell; | ||
111 | } | ||
112 | set | ||
113 | { | ||
114 | _dwell = value; | ||
115 | } | ||
116 | } | ||
117 | 100 | ||
118 | /// <summary> | 101 | /// <summary> |
119 | /// Whether to obscure parcel media URL | 102 | /// Whether to obscure parcel media URL |
120 | /// </summary> | 103 | /// </summary> |
121 | [XmlIgnore] | 104 | [XmlIgnore] |
122 | public bool ObscureMedia | 105 | public bool ObscureMedia { |
123 | { | 106 | get { |
124 | get | ||
125 | { | ||
126 | return _obscureMedia; | 107 | return _obscureMedia; |
127 | } | 108 | } |
128 | set | 109 | set { |
129 | { | ||
130 | _obscureMedia = value; | 110 | _obscureMedia = value; |
131 | } | 111 | } |
132 | } | 112 | } |
@@ -135,14 +115,11 @@ namespace OpenSim.Framework | |||
135 | /// Whether to obscure parcel music URL | 115 | /// Whether to obscure parcel music URL |
136 | /// </summary> | 116 | /// </summary> |
137 | [XmlIgnore] | 117 | [XmlIgnore] |
138 | public bool ObscureMusic | 118 | public bool ObscureMusic { |
139 | { | 119 | get { |
140 | get | ||
141 | { | ||
142 | return _obscureMusic; | 120 | return _obscureMusic; |
143 | } | 121 | } |
144 | set | 122 | set { |
145 | { | ||
146 | _obscureMusic = value; | 123 | _obscureMusic = value; |
147 | } | 124 | } |
148 | } | 125 | } |
@@ -151,14 +128,11 @@ namespace OpenSim.Framework | |||
151 | /// Whether to loop parcel media | 128 | /// Whether to loop parcel media |
152 | /// </summary> | 129 | /// </summary> |
153 | [XmlIgnore] | 130 | [XmlIgnore] |
154 | public bool MediaLoop | 131 | public bool MediaLoop { |
155 | { | 132 | get { |
156 | get | ||
157 | { | ||
158 | return _mediaLoop; | 133 | return _mediaLoop; |
159 | } | 134 | } |
160 | set | 135 | set { |
161 | { | ||
162 | _mediaLoop = value; | 136 | _mediaLoop = value; |
163 | } | 137 | } |
164 | } | 138 | } |
@@ -167,14 +141,11 @@ namespace OpenSim.Framework | |||
167 | /// Height of parcel media render | 141 | /// Height of parcel media render |
168 | /// </summary> | 142 | /// </summary> |
169 | [XmlIgnore] | 143 | [XmlIgnore] |
170 | public int MediaHeight | 144 | public int MediaHeight { |
171 | { | 145 | get { |
172 | get | ||
173 | { | ||
174 | return _mediaHeight; | 146 | return _mediaHeight; |
175 | } | 147 | } |
176 | set | 148 | set { |
177 | { | ||
178 | _mediaHeight = value; | 149 | _mediaHeight = value; |
179 | } | 150 | } |
180 | } | 151 | } |
@@ -183,14 +154,11 @@ namespace OpenSim.Framework | |||
183 | /// Width of parcel media render | 154 | /// Width of parcel media render |
184 | /// </summary> | 155 | /// </summary> |
185 | [XmlIgnore] | 156 | [XmlIgnore] |
186 | public int MediaWidth | 157 | public int MediaWidth { |
187 | { | 158 | get { |
188 | get | ||
189 | { | ||
190 | return _mediaWidth; | 159 | return _mediaWidth; |
191 | } | 160 | } |
192 | set | 161 | set { |
193 | { | ||
194 | _mediaWidth = value; | 162 | _mediaWidth = value; |
195 | } | 163 | } |
196 | } | 164 | } |
@@ -199,14 +167,11 @@ namespace OpenSim.Framework | |||
199 | /// Upper corner of the AABB for the parcel | 167 | /// Upper corner of the AABB for the parcel |
200 | /// </summary> | 168 | /// </summary> |
201 | [XmlIgnore] | 169 | [XmlIgnore] |
202 | public Vector3 AABBMax | 170 | public Vector3 AABBMax { |
203 | { | 171 | get { |
204 | get | ||
205 | { | ||
206 | return _AABBMax; | 172 | return _AABBMax; |
207 | } | 173 | } |
208 | set | 174 | set { |
209 | { | ||
210 | _AABBMax = value; | 175 | _AABBMax = value; |
211 | } | 176 | } |
212 | } | 177 | } |
@@ -214,14 +179,11 @@ namespace OpenSim.Framework | |||
214 | /// Lower corner of the AABB for the parcel | 179 | /// Lower corner of the AABB for the parcel |
215 | /// </summary> | 180 | /// </summary> |
216 | [XmlIgnore] | 181 | [XmlIgnore] |
217 | public Vector3 AABBMin | 182 | public Vector3 AABBMin { |
218 | { | 183 | get { |
219 | get | ||
220 | { | ||
221 | return _AABBMin; | 184 | return _AABBMin; |
222 | } | 185 | } |
223 | set | 186 | set { |
224 | { | ||
225 | _AABBMin = value; | 187 | _AABBMin = value; |
226 | } | 188 | } |
227 | } | 189 | } |
@@ -229,14 +191,11 @@ namespace OpenSim.Framework | |||
229 | /// <summary> | 191 | /// <summary> |
230 | /// Area in meters^2 the parcel contains | 192 | /// Area in meters^2 the parcel contains |
231 | /// </summary> | 193 | /// </summary> |
232 | public int Area | 194 | public int Area { |
233 | { | 195 | get { |
234 | get | ||
235 | { | ||
236 | return _area; | 196 | return _area; |
237 | } | 197 | } |
238 | set | 198 | set { |
239 | { | ||
240 | _area = value; | 199 | _area = value; |
241 | } | 200 | } |
242 | } | 201 | } |
@@ -244,14 +203,11 @@ namespace OpenSim.Framework | |||
244 | /// <summary> | 203 | /// <summary> |
245 | /// ID of auction (3rd Party Integration) when parcel is being auctioned | 204 | /// ID of auction (3rd Party Integration) when parcel is being auctioned |
246 | /// </summary> | 205 | /// </summary> |
247 | public uint AuctionID | 206 | public uint AuctionID { |
248 | { | 207 | get { |
249 | get | ||
250 | { | ||
251 | return _auctionID; | 208 | return _auctionID; |
252 | } | 209 | } |
253 | set | 210 | set { |
254 | { | ||
255 | _auctionID = value; | 211 | _auctionID = value; |
256 | } | 212 | } |
257 | } | 213 | } |
@@ -259,14 +215,11 @@ namespace OpenSim.Framework | |||
259 | /// <summary> | 215 | /// <summary> |
260 | /// UUID of authorized buyer of parcel. This is UUID.Zero if anyone can buy it. | 216 | /// UUID of authorized buyer of parcel. This is UUID.Zero if anyone can buy it. |
261 | /// </summary> | 217 | /// </summary> |
262 | public UUID AuthBuyerID | 218 | public UUID AuthBuyerID { |
263 | { | 219 | get { |
264 | get | ||
265 | { | ||
266 | return _authBuyerID; | 220 | return _authBuyerID; |
267 | } | 221 | } |
268 | set | 222 | set { |
269 | { | ||
270 | _authBuyerID = value; | 223 | _authBuyerID = value; |
271 | } | 224 | } |
272 | } | 225 | } |
@@ -274,14 +227,11 @@ namespace OpenSim.Framework | |||
274 | /// <summary> | 227 | /// <summary> |
275 | /// Category of parcel. Used for classifying the parcel in classified listings | 228 | /// Category of parcel. Used for classifying the parcel in classified listings |
276 | /// </summary> | 229 | /// </summary> |
277 | public ParcelCategory Category | 230 | public ParcelCategory Category { |
278 | { | 231 | get { |
279 | get | ||
280 | { | ||
281 | return _category; | 232 | return _category; |
282 | } | 233 | } |
283 | set | 234 | set { |
284 | { | ||
285 | _category = value; | 235 | _category = value; |
286 | } | 236 | } |
287 | } | 237 | } |
@@ -289,14 +239,11 @@ namespace OpenSim.Framework | |||
289 | /// <summary> | 239 | /// <summary> |
290 | /// Date that the current owner purchased or claimed the parcel | 240 | /// Date that the current owner purchased or claimed the parcel |
291 | /// </summary> | 241 | /// </summary> |
292 | public int ClaimDate | 242 | public int ClaimDate { |
293 | { | 243 | get { |
294 | get | ||
295 | { | ||
296 | return _claimDate; | 244 | return _claimDate; |
297 | } | 245 | } |
298 | set | 246 | set { |
299 | { | ||
300 | _claimDate = value; | 247 | _claimDate = value; |
301 | } | 248 | } |
302 | } | 249 | } |
@@ -304,14 +251,11 @@ namespace OpenSim.Framework | |||
304 | /// <summary> | 251 | /// <summary> |
305 | /// The last price that the parcel was sold at | 252 | /// The last price that the parcel was sold at |
306 | /// </summary> | 253 | /// </summary> |
307 | public int ClaimPrice | 254 | public int ClaimPrice { |
308 | { | 255 | get { |
309 | get | ||
310 | { | ||
311 | return _claimPrice; | 256 | return _claimPrice; |
312 | } | 257 | } |
313 | set | 258 | set { |
314 | { | ||
315 | _claimPrice = value; | 259 | _claimPrice = value; |
316 | } | 260 | } |
317 | } | 261 | } |
@@ -319,14 +263,11 @@ namespace OpenSim.Framework | |||
319 | /// <summary> | 263 | /// <summary> |
320 | /// Global ID for the parcel. (3rd Party Integration) | 264 | /// Global ID for the parcel. (3rd Party Integration) |
321 | /// </summary> | 265 | /// </summary> |
322 | public UUID GlobalID | 266 | public UUID GlobalID { |
323 | { | 267 | get { |
324 | get | ||
325 | { | ||
326 | return _globalID; | 268 | return _globalID; |
327 | } | 269 | } |
328 | set | 270 | set { |
329 | { | ||
330 | _globalID = value; | 271 | _globalID = value; |
331 | } | 272 | } |
332 | } | 273 | } |
@@ -334,14 +275,11 @@ namespace OpenSim.Framework | |||
334 | /// <summary> | 275 | /// <summary> |
335 | /// Unique ID of the Group that owns | 276 | /// Unique ID of the Group that owns |
336 | /// </summary> | 277 | /// </summary> |
337 | public UUID GroupID | 278 | public UUID GroupID { |
338 | { | 279 | get { |
339 | get | ||
340 | { | ||
341 | return _groupID; | 280 | return _groupID; |
342 | } | 281 | } |
343 | set | 282 | set { |
344 | { | ||
345 | _groupID = value; | 283 | _groupID = value; |
346 | } | 284 | } |
347 | } | 285 | } |
@@ -349,14 +287,11 @@ namespace OpenSim.Framework | |||
349 | /// <summary> | 287 | /// <summary> |
350 | /// Returns true if the Land Parcel is owned by a group | 288 | /// Returns true if the Land Parcel is owned by a group |
351 | /// </summary> | 289 | /// </summary> |
352 | public bool IsGroupOwned | 290 | public bool IsGroupOwned { |
353 | { | 291 | get { |
354 | get | ||
355 | { | ||
356 | return _isGroupOwned; | 292 | return _isGroupOwned; |
357 | } | 293 | } |
358 | set | 294 | set { |
359 | { | ||
360 | _isGroupOwned = value; | 295 | _isGroupOwned = value; |
361 | } | 296 | } |
362 | } | 297 | } |
@@ -364,14 +299,11 @@ namespace OpenSim.Framework | |||
364 | /// <summary> | 299 | /// <summary> |
365 | /// jp2 data for the image representative of the parcel in the parcel dialog | 300 | /// jp2 data for the image representative of the parcel in the parcel dialog |
366 | /// </summary> | 301 | /// </summary> |
367 | public byte[] Bitmap | 302 | public byte[] Bitmap { |
368 | { | 303 | get { |
369 | get | ||
370 | { | ||
371 | return _bitmap; | 304 | return _bitmap; |
372 | } | 305 | } |
373 | set | 306 | set { |
374 | { | ||
375 | _bitmap = value; | 307 | _bitmap = value; |
376 | } | 308 | } |
377 | } | 309 | } |
@@ -379,14 +311,11 @@ namespace OpenSim.Framework | |||
379 | /// <summary> | 311 | /// <summary> |
380 | /// Parcel Description | 312 | /// Parcel Description |
381 | /// </summary> | 313 | /// </summary> |
382 | public string Description | 314 | public string Description { |
383 | { | 315 | get { |
384 | get | ||
385 | { | ||
386 | return _description; | 316 | return _description; |
387 | } | 317 | } |
388 | set | 318 | set { |
389 | { | ||
390 | _description = value; | 319 | _description = value; |
391 | } | 320 | } |
392 | } | 321 | } |
@@ -394,14 +323,11 @@ namespace OpenSim.Framework | |||
394 | /// <summary> | 323 | /// <summary> |
395 | /// Parcel settings. Access flags, Fly, NoPush, Voice, Scripts allowed, etc. ParcelFlags | 324 | /// Parcel settings. Access flags, Fly, NoPush, Voice, Scripts allowed, etc. ParcelFlags |
396 | /// </summary> | 325 | /// </summary> |
397 | public uint Flags | 326 | public uint Flags { |
398 | { | 327 | get { |
399 | get | ||
400 | { | ||
401 | return _flags; | 328 | return _flags; |
402 | } | 329 | } |
403 | set | 330 | set { |
404 | { | ||
405 | _flags = value; | 331 | _flags = value; |
406 | } | 332 | } |
407 | } | 333 | } |
@@ -410,14 +336,11 @@ namespace OpenSim.Framework | |||
410 | /// Determines if people are able to teleport where they please on the parcel or if they | 336 | /// Determines if people are able to teleport where they please on the parcel or if they |
411 | /// get constrainted to a specific point on teleport within the parcel | 337 | /// get constrainted to a specific point on teleport within the parcel |
412 | /// </summary> | 338 | /// </summary> |
413 | public byte LandingType | 339 | public byte LandingType { |
414 | { | 340 | get { |
415 | get | ||
416 | { | ||
417 | return _landingType; | 341 | return _landingType; |
418 | } | 342 | } |
419 | set | 343 | set { |
420 | { | ||
421 | _landingType = value; | 344 | _landingType = value; |
422 | } | 345 | } |
423 | } | 346 | } |
@@ -425,14 +348,11 @@ namespace OpenSim.Framework | |||
425 | /// <summary> | 348 | /// <summary> |
426 | /// Parcel Name | 349 | /// Parcel Name |
427 | /// </summary> | 350 | /// </summary> |
428 | public string Name | 351 | public string Name { |
429 | { | 352 | get { |
430 | get | ||
431 | { | ||
432 | return _name; | 353 | return _name; |
433 | } | 354 | } |
434 | set | 355 | set { |
435 | { | ||
436 | _name = value; | 356 | _name = value; |
437 | } | 357 | } |
438 | } | 358 | } |
@@ -440,14 +360,11 @@ namespace OpenSim.Framework | |||
440 | /// <summary> | 360 | /// <summary> |
441 | /// Status of Parcel, Leased, Abandoned, For Sale | 361 | /// Status of Parcel, Leased, Abandoned, For Sale |
442 | /// </summary> | 362 | /// </summary> |
443 | public ParcelStatus Status | 363 | public ParcelStatus Status { |
444 | { | 364 | get { |
445 | get | ||
446 | { | ||
447 | return _status; | 365 | return _status; |
448 | } | 366 | } |
449 | set | 367 | set { |
450 | { | ||
451 | _status = value; | 368 | _status = value; |
452 | } | 369 | } |
453 | } | 370 | } |
@@ -455,14 +372,11 @@ namespace OpenSim.Framework | |||
455 | /// <summary> | 372 | /// <summary> |
456 | /// Internal ID of the parcel. Sometimes the client will try to use this value | 373 | /// Internal ID of the parcel. Sometimes the client will try to use this value |
457 | /// </summary> | 374 | /// </summary> |
458 | public int LocalID | 375 | public int LocalID { |
459 | { | 376 | get { |
460 | get | ||
461 | { | ||
462 | return _localID; | 377 | return _localID; |
463 | } | 378 | } |
464 | set | 379 | set { |
465 | { | ||
466 | _localID = value; | 380 | _localID = value; |
467 | } | 381 | } |
468 | } | 382 | } |
@@ -470,14 +384,11 @@ namespace OpenSim.Framework | |||
470 | /// <summary> | 384 | /// <summary> |
471 | /// Determines if we scale the media based on the surface it's on | 385 | /// Determines if we scale the media based on the surface it's on |
472 | /// </summary> | 386 | /// </summary> |
473 | public byte MediaAutoScale | 387 | public byte MediaAutoScale { |
474 | { | 388 | get { |
475 | get | ||
476 | { | ||
477 | return _mediaAutoScale; | 389 | return _mediaAutoScale; |
478 | } | 390 | } |
479 | set | 391 | set { |
480 | { | ||
481 | _mediaAutoScale = value; | 392 | _mediaAutoScale = value; |
482 | } | 393 | } |
483 | } | 394 | } |
@@ -485,14 +396,11 @@ namespace OpenSim.Framework | |||
485 | /// <summary> | 396 | /// <summary> |
486 | /// Texture Guid to replace with the output of the media stream | 397 | /// Texture Guid to replace with the output of the media stream |
487 | /// </summary> | 398 | /// </summary> |
488 | public UUID MediaID | 399 | public UUID MediaID { |
489 | { | 400 | get { |
490 | get | ||
491 | { | ||
492 | return _mediaID; | 401 | return _mediaID; |
493 | } | 402 | } |
494 | set | 403 | set { |
495 | { | ||
496 | _mediaID = value; | 404 | _mediaID = value; |
497 | } | 405 | } |
498 | } | 406 | } |
@@ -500,14 +408,11 @@ namespace OpenSim.Framework | |||
500 | /// <summary> | 408 | /// <summary> |
501 | /// URL to the media file to display | 409 | /// URL to the media file to display |
502 | /// </summary> | 410 | /// </summary> |
503 | public string MediaURL | 411 | public string MediaURL { |
504 | { | 412 | get { |
505 | get | ||
506 | { | ||
507 | return _mediaURL; | 413 | return _mediaURL; |
508 | } | 414 | } |
509 | set | 415 | set { |
510 | { | ||
511 | _mediaURL = value; | 416 | _mediaURL = value; |
512 | } | 417 | } |
513 | } | 418 | } |
@@ -527,14 +432,11 @@ namespace OpenSim.Framework | |||
527 | /// <summary> | 432 | /// <summary> |
528 | /// URL to the shoutcast music stream to play on the parcel | 433 | /// URL to the shoutcast music stream to play on the parcel |
529 | /// </summary> | 434 | /// </summary> |
530 | public string MusicURL | 435 | public string MusicURL { |
531 | { | 436 | get { |
532 | get | ||
533 | { | ||
534 | return _musicURL; | 437 | return _musicURL; |
535 | } | 438 | } |
536 | set | 439 | set { |
537 | { | ||
538 | _musicURL = value; | 440 | _musicURL = value; |
539 | } | 441 | } |
540 | } | 442 | } |
@@ -543,14 +445,11 @@ namespace OpenSim.Framework | |||
543 | /// Owner Avatar or Group of the parcel. Naturally, all land masses must be | 445 | /// Owner Avatar or Group of the parcel. Naturally, all land masses must be |
544 | /// owned by someone | 446 | /// owned by someone |
545 | /// </summary> | 447 | /// </summary> |
546 | public UUID OwnerID | 448 | public UUID OwnerID { |
547 | { | 449 | get { |
548 | get | ||
549 | { | ||
550 | return _ownerID; | 450 | return _ownerID; |
551 | } | 451 | } |
552 | set | 452 | set { |
553 | { | ||
554 | _ownerID = value; | 453 | _ownerID = value; |
555 | } | 454 | } |
556 | } | 455 | } |
@@ -558,14 +457,11 @@ namespace OpenSim.Framework | |||
558 | /// <summary> | 457 | /// <summary> |
559 | /// List of access data for the parcel. User data, some bitflags, and a time | 458 | /// List of access data for the parcel. User data, some bitflags, and a time |
560 | /// </summary> | 459 | /// </summary> |
561 | public List<LandAccessEntry> ParcelAccessList | 460 | public List<LandAccessEntry> ParcelAccessList { |
562 | { | 461 | get { |
563 | get | ||
564 | { | ||
565 | return _parcelAccessList; | 462 | return _parcelAccessList; |
566 | } | 463 | } |
567 | set | 464 | set { |
568 | { | ||
569 | _parcelAccessList = value; | 465 | _parcelAccessList = value; |
570 | } | 466 | } |
571 | } | 467 | } |
@@ -573,14 +469,11 @@ namespace OpenSim.Framework | |||
573 | /// <summary> | 469 | /// <summary> |
574 | /// How long in hours a Pass to the parcel is given | 470 | /// How long in hours a Pass to the parcel is given |
575 | /// </summary> | 471 | /// </summary> |
576 | public float PassHours | 472 | public float PassHours { |
577 | { | 473 | get { |
578 | get | ||
579 | { | ||
580 | return _passHours; | 474 | return _passHours; |
581 | } | 475 | } |
582 | set | 476 | set { |
583 | { | ||
584 | _passHours = value; | 477 | _passHours = value; |
585 | } | 478 | } |
586 | } | 479 | } |
@@ -588,14 +481,11 @@ namespace OpenSim.Framework | |||
588 | /// <summary> | 481 | /// <summary> |
589 | /// Price to purchase a Pass to a restricted parcel | 482 | /// Price to purchase a Pass to a restricted parcel |
590 | /// </summary> | 483 | /// </summary> |
591 | public int PassPrice | 484 | public int PassPrice { |
592 | { | 485 | get { |
593 | get | ||
594 | { | ||
595 | return _passPrice; | 486 | return _passPrice; |
596 | } | 487 | } |
597 | set | 488 | set { |
598 | { | ||
599 | _passPrice = value; | 489 | _passPrice = value; |
600 | } | 490 | } |
601 | } | 491 | } |
@@ -603,14 +493,11 @@ namespace OpenSim.Framework | |||
603 | /// <summary> | 493 | /// <summary> |
604 | /// When the parcel is being sold, this is the price to purchase the parcel | 494 | /// When the parcel is being sold, this is the price to purchase the parcel |
605 | /// </summary> | 495 | /// </summary> |
606 | public int SalePrice | 496 | public int SalePrice { |
607 | { | 497 | get { |
608 | get | ||
609 | { | ||
610 | return _salePrice; | 498 | return _salePrice; |
611 | } | 499 | } |
612 | set | 500 | set { |
613 | { | ||
614 | _salePrice = value; | 501 | _salePrice = value; |
615 | } | 502 | } |
616 | } | 503 | } |
@@ -619,14 +506,11 @@ namespace OpenSim.Framework | |||
619 | /// Number of meters^2 in the Simulator | 506 | /// Number of meters^2 in the Simulator |
620 | /// </summary> | 507 | /// </summary> |
621 | [XmlIgnore] | 508 | [XmlIgnore] |
622 | public int SimwideArea | 509 | public int SimwideArea { |
623 | { | 510 | get { |
624 | get | ||
625 | { | ||
626 | return _simwideArea; | 511 | return _simwideArea; |
627 | } | 512 | } |
628 | set | 513 | set { |
629 | { | ||
630 | _simwideArea = value; | 514 | _simwideArea = value; |
631 | } | 515 | } |
632 | } | 516 | } |
@@ -635,14 +519,11 @@ namespace OpenSim.Framework | |||
635 | /// Number of SceneObjectPart in the Simulator | 519 | /// Number of SceneObjectPart in the Simulator |
636 | /// </summary> | 520 | /// </summary> |
637 | [XmlIgnore] | 521 | [XmlIgnore] |
638 | public int SimwidePrims | 522 | public int SimwidePrims { |
639 | { | 523 | get { |
640 | get | ||
641 | { | ||
642 | return _simwidePrims; | 524 | return _simwidePrims; |
643 | } | 525 | } |
644 | set | 526 | set { |
645 | { | ||
646 | _simwidePrims = value; | 527 | _simwidePrims = value; |
647 | } | 528 | } |
648 | } | 529 | } |
@@ -650,14 +531,11 @@ namespace OpenSim.Framework | |||
650 | /// <summary> | 531 | /// <summary> |
651 | /// ID of the snapshot used in the client parcel dialog of the parcel | 532 | /// ID of the snapshot used in the client parcel dialog of the parcel |
652 | /// </summary> | 533 | /// </summary> |
653 | public UUID SnapshotID | 534 | public UUID SnapshotID { |
654 | { | 535 | get { |
655 | get | ||
656 | { | ||
657 | return _snapshotID; | 536 | return _snapshotID; |
658 | } | 537 | } |
659 | set | 538 | set { |
660 | { | ||
661 | _snapshotID = value; | 539 | _snapshotID = value; |
662 | } | 540 | } |
663 | } | 541 | } |
@@ -666,14 +544,11 @@ namespace OpenSim.Framework | |||
666 | /// When teleporting is restricted to a certain point, this is the location | 544 | /// When teleporting is restricted to a certain point, this is the location |
667 | /// that the user will be redirected to | 545 | /// that the user will be redirected to |
668 | /// </summary> | 546 | /// </summary> |
669 | public Vector3 UserLocation | 547 | public Vector3 UserLocation { |
670 | { | 548 | get { |
671 | get | ||
672 | { | ||
673 | return _userLocation; | 549 | return _userLocation; |
674 | } | 550 | } |
675 | set | 551 | set { |
676 | { | ||
677 | _userLocation = value; | 552 | _userLocation = value; |
678 | } | 553 | } |
679 | } | 554 | } |
@@ -682,14 +557,11 @@ namespace OpenSim.Framework | |||
682 | /// When teleporting is restricted to a certain point, this is the rotation | 557 | /// When teleporting is restricted to a certain point, this is the rotation |
683 | /// that the user will be positioned | 558 | /// that the user will be positioned |
684 | /// </summary> | 559 | /// </summary> |
685 | public Vector3 UserLookAt | 560 | public Vector3 UserLookAt { |
686 | { | 561 | get { |
687 | get | ||
688 | { | ||
689 | return _userLookAt; | 562 | return _userLookAt; |
690 | } | 563 | } |
691 | set | 564 | set { |
692 | { | ||
693 | _userLookAt = value; | 565 | _userLookAt = value; |
694 | } | 566 | } |
695 | } | 567 | } |
@@ -698,14 +570,11 @@ namespace OpenSim.Framework | |||
698 | /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own | 570 | /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own |
699 | /// the parcel and isn't set to the same 'group' as the parcel. | 571 | /// the parcel and isn't set to the same 'group' as the parcel. |
700 | /// </summary> | 572 | /// </summary> |
701 | public int OtherCleanTime | 573 | public int OtherCleanTime { |
702 | { | 574 | get { |
703 | get | ||
704 | { | ||
705 | return _otherCleanTime; | 575 | return _otherCleanTime; |
706 | } | 576 | } |
707 | set | 577 | set { |
708 | { | ||
709 | _otherCleanTime = value; | 578 | _otherCleanTime = value; |
710 | } | 579 | } |
711 | } | 580 | } |
@@ -713,14 +582,11 @@ namespace OpenSim.Framework | |||
713 | /// <summary> | 582 | /// <summary> |
714 | /// parcel media description | 583 | /// parcel media description |
715 | /// </summary> | 584 | /// </summary> |
716 | public string MediaDescription | 585 | public string MediaDescription { |
717 | { | 586 | get { |
718 | get | ||
719 | { | ||
720 | return _mediaDescription; | 587 | return _mediaDescription; |
721 | } | 588 | } |
722 | set | 589 | set { |
723 | { | ||
724 | _mediaDescription = value; | 590 | _mediaDescription = value; |
725 | } | 591 | } |
726 | } | 592 | } |
@@ -756,7 +622,7 @@ namespace OpenSim.Framework | |||
756 | landData._mediaURL = _mediaURL; | 622 | landData._mediaURL = _mediaURL; |
757 | landData._musicURL = _musicURL; | 623 | landData._musicURL = _musicURL; |
758 | landData._ownerID = _ownerID; | 624 | landData._ownerID = _ownerID; |
759 | landData._bitmap = (byte[])_bitmap.Clone(); | 625 | landData._bitmap = (byte[]) _bitmap.Clone(); |
760 | landData._description = _description; | 626 | landData._description = _description; |
761 | landData._flags = _flags; | 627 | landData._flags = _flags; |
762 | landData._name = _name; | 628 | landData._name = _name; |
@@ -777,7 +643,6 @@ namespace OpenSim.Framework | |||
777 | landData._obscureMedia = _obscureMedia; | 643 | landData._obscureMedia = _obscureMedia; |
778 | landData._simwideArea = _simwideArea; | 644 | landData._simwideArea = _simwideArea; |
779 | landData._simwidePrims = _simwidePrims; | 645 | landData._simwidePrims = _simwidePrims; |
780 | landData._dwell = _dwell; | ||
781 | 646 | ||
782 | landData._parcelAccessList.Clear(); | 647 | landData._parcelAccessList.Clear(); |
783 | foreach (LandAccessEntry entry in _parcelAccessList) | 648 | foreach (LandAccessEntry entry in _parcelAccessList) |