aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/LandData.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-18 05:51:36 +0000
committerMelanie Thielker2008-10-18 05:51:36 +0000
commitefe3f3eb2a0a31b1da474974c7d8193c2b28e13f (patch)
treedf1d30ad2f9230ea4e8fbfd1e6368d539600c785 /OpenSim/Framework/LandData.cs
parent* Fix an over compensation for bounciness on flat Primitive (diff)
downloadopensim-SC_OLD-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.zip
opensim-SC_OLD-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.gz
opensim-SC_OLD-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.bz2
opensim-SC_OLD-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.xz
Megapatch. :) Fix skull attachment editing. Streamline Object terse updates.
Add rezzing time to objects. Add Object return and traffic fields to land database. Add plumbing for auto return. Implement auto return. Contains a migration. May contain nuts.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/LandData.cs22
1 files changed, 22 insertions, 0 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 4e66721..7d29d10 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -77,6 +77,8 @@ namespace OpenSim.Framework
77 private UUID _snapshotID = UUID.Zero; 77 private UUID _snapshotID = UUID.Zero;
78 private Vector3 _userLocation = new Vector3(); 78 private Vector3 _userLocation = new Vector3();
79 private Vector3 _userLookAt = new Vector3(); 79 private Vector3 _userLookAt = new Vector3();
80 private int _dwell = 0;
81 private int _otherCleanTime = 0;
80 82
81 public Vector3 AABBMax { 83 public Vector3 AABBMax {
82 get { 84 get {
@@ -402,6 +404,24 @@ namespace OpenSim.Framework
402 } 404 }
403 } 405 }
404 406
407 public int Dwell {
408 get {
409 return _dwell;
410 }
411 set {
412 _dwell = value;
413 }
414 }
415
416 public int OtherCleanTime {
417 get {
418 return _otherCleanTime;
419 }
420 set {
421 _otherCleanTime = value;
422 }
423 }
424
405 public LandData() 425 public LandData()
406 { 426 {
407 _globalID = UUID.Random(); 427 _globalID = UUID.Random();
@@ -444,6 +464,8 @@ namespace OpenSim.Framework
444 landData._snapshotID = _snapshotID; 464 landData._snapshotID = _snapshotID;
445 landData._userLocation = _userLocation; 465 landData._userLocation = _userLocation;
446 landData._userLookAt = _userLookAt; 466 landData._userLookAt = _userLookAt;
467 landData._otherCleanTime = _otherCleanTime;
468 landData._dwell = _dwell;
447 469
448 landData._parcelAccessList.Clear(); 470 landData._parcelAccessList.Clear();
449 foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList) 471 foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)