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