aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/LandData.cs
diff options
context:
space:
mode:
authorKitto Flora2010-09-06 21:45:17 +0000
committerKitto Flora2010-09-06 21:45:17 +0000
commitcfaefad754642677dbddfcbe743c3fa5e058785d (patch)
tree48ac26cc5289d8c0459837cd7d6936152216403b /OpenSim/Framework/LandData.cs
parentFalling animation fix, comment out instrumentation. (diff)
parentFix yet another cause of "Ghost attachments" (diff)
downloadopensim-SC-cfaefad754642677dbddfcbe743c3fa5e058785d.zip
opensim-SC-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.gz
opensim-SC-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.bz2
opensim-SC-cfaefad754642677dbddfcbe743c3fa5e058785d.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/LandData.cs14
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 4440c94..5bb0413 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -88,7 +88,6 @@ namespace OpenSim.Framework
88 private UUID _snapshotID = UUID.Zero; 88 private UUID _snapshotID = UUID.Zero;
89 private Vector3 _userLocation = new Vector3(); 89 private Vector3 _userLocation = new Vector3();
90 private Vector3 _userLookAt = new Vector3(); 90 private Vector3 _userLookAt = new Vector3();
91 private int _dwell = 0;
92 private int _otherCleanTime = 0; 91 private int _otherCleanTime = 0;
93 private string _mediaType = "none/none"; 92 private string _mediaType = "none/none";
94 private string _mediaDescription = ""; 93 private string _mediaDescription = "";
@@ -620,18 +619,6 @@ namespace OpenSim.Framework
620 } 619 }
621 620
622 /// <summary> 621 /// <summary>
623 /// Deprecated idea. Number of visitors ~= free money
624 /// </summary>
625 public int Dwell {
626 get {
627 return _dwell;
628 }
629 set {
630 _dwell = value;
631 }
632 }
633
634 /// <summary>
635 /// Number of minutes to return SceneObjectGroup that are owned by someone who doesn't own 622 /// Number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
636 /// the parcel and isn't set to the same 'group' as the parcel. 623 /// the parcel and isn't set to the same 'group' as the parcel.
637 /// </summary> 624 /// </summary>
@@ -703,7 +690,6 @@ namespace OpenSim.Framework
703 landData._userLocation = _userLocation; 690 landData._userLocation = _userLocation;
704 landData._userLookAt = _userLookAt; 691 landData._userLookAt = _userLookAt;
705 landData._otherCleanTime = _otherCleanTime; 692 landData._otherCleanTime = _otherCleanTime;
706 landData._dwell = _dwell;
707 landData._mediaType = _mediaType; 693 landData._mediaType = _mediaType;
708 landData._mediaDescription = _mediaDescription; 694 landData._mediaDescription = _mediaDescription;
709 landData._mediaWidth = _mediaWidth; 695 landData._mediaWidth = _mediaWidth;