diff options
author | MW | 2008-10-10 15:02:40 +0000 |
---|---|---|
committer | MW | 2008-10-10 15:02:40 +0000 |
commit | 1edfbc652a130a6c318182b16680c58bd4902736 (patch) | |
tree | 3792c4ea28293b64f4ccaeb7872cca31b78bb6e6 /OpenSim | |
parent | * Added NullReference check to EventQueueGetModule. (diff) | |
download | opensim-SC_OLD-1edfbc652a130a6c318182b16680c58bd4902736.zip opensim-SC_OLD-1edfbc652a130a6c318182b16680c58bd4902736.tar.gz opensim-SC_OLD-1edfbc652a130a6c318182b16680c58bd4902736.tar.bz2 opensim-SC_OLD-1edfbc652a130a6c318182b16680c58bd4902736.tar.xz |
very tiny change
XmlIgnored the SceneObjectPart.SitTargetAvatar property, as (afaik) this is only used to indicate that a avatar is sitting (or about to sit) on the prim.
And there are situations where it might not be cleared, like if a client crashes while sitting on the prim. Which results in that avatar's id getting stored in any xml backup or taking the prim into inventory. And then its always classed as a avatar is sitting on that prim.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 7e7b2aa..f5cc680 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -783,9 +783,7 @@ if (m_shape != null) { | |||
783 | #endregion | 783 | #endregion |
784 | 784 | ||
785 | //--------------- | 785 | //--------------- |
786 | 786 | #region Public Properties with only Get | |
787 | |||
788 | #region Public Properties with only Get | ||
789 | 787 | ||
790 | 788 | ||
791 | public Vector3 AbsolutePosition | 789 | public Vector3 AbsolutePosition |
@@ -957,6 +955,7 @@ if (m_shape != null) { | |||
957 | set { _flags = value; } | 955 | set { _flags = value; } |
958 | } | 956 | } |
959 | 957 | ||
958 | [XmlIgnore] | ||
960 | public UUID SitTargetAvatar | 959 | public UUID SitTargetAvatar |
961 | { | 960 | { |
962 | get { return m_sitTargetAvatar; } | 961 | get { return m_sitTargetAvatar; } |
@@ -993,6 +992,8 @@ if (m_shape != null) { | |||
993 | 992 | ||
994 | #endregion Public Properties with only Get | 993 | #endregion Public Properties with only Get |
995 | 994 | ||
995 | |||
996 | |||
996 | #region Private Methods | 997 | #region Private Methods |
997 | 998 | ||
998 | private uint ApplyMask(uint val, bool set, uint mask) | 999 | private uint ApplyMask(uint val, bool set, uint mask) |