diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index dd1a29d..e0fd84a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1860,11 +1860,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1860 | 4); // PERMISSION_TAKE_CONTROLS | 1860 | 4); // PERMISSION_TAKE_CONTROLS |
1861 | } | 1861 | } |
1862 | } | 1862 | } |
1863 | |||
1864 | } | 1863 | } |
1864 | |||
1865 | // Reset sit target. | 1865 | // Reset sit target. |
1866 | if (part.GetAvatarOnSitTarget() == UUID) | 1866 | if (part.SitTargetAvatar == UUID) |
1867 | part.SitTargetAvatar = UUID.Zero; | 1867 | part.SitTargetAvatar = UUID.Zero; |
1868 | |||
1868 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); | 1869 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); |
1869 | 1870 | ||
1870 | ParentPosition = part.GetWorldPosition(); | 1871 | ParentPosition = part.GetWorldPosition(); |
@@ -1913,7 +1914,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1913 | // Is a sit target available? | 1914 | // Is a sit target available? |
1914 | Vector3 avSitOffSet = part.SitTargetPosition; | 1915 | Vector3 avSitOffSet = part.SitTargetPosition; |
1915 | Quaternion avSitOrientation = part.SitTargetOrientation; | 1916 | Quaternion avSitOrientation = part.SitTargetOrientation; |
1916 | UUID avOnTargetAlready = part.GetAvatarOnSitTarget(); | 1917 | UUID avOnTargetAlready = part.SitTargetAvatar; |
1917 | 1918 | ||
1918 | bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); | 1919 | bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); |
1919 | bool SitTargetisSet = | 1920 | bool SitTargetisSet = |
@@ -1950,7 +1951,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1950 | // Is a sit target available? | 1951 | // Is a sit target available? |
1951 | Vector3 avSitOffSet = part.SitTargetPosition; | 1952 | Vector3 avSitOffSet = part.SitTargetPosition; |
1952 | Quaternion avSitOrientation = part.SitTargetOrientation; | 1953 | Quaternion avSitOrientation = part.SitTargetOrientation; |
1953 | UUID avOnTargetAlready = part.GetAvatarOnSitTarget(); | 1954 | UUID avOnTargetAlready = part.SitTargetAvatar; |
1954 | 1955 | ||
1955 | bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); | 1956 | bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); |
1956 | bool SitTargetisSet = | 1957 | bool SitTargetisSet = |
@@ -2278,7 +2279,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2278 | { | 2279 | { |
2279 | if (part != null) | 2280 | if (part != null) |
2280 | { | 2281 | { |
2281 | if (part.GetAvatarOnSitTarget() == UUID) | 2282 | if (part.SitTargetAvatar == UUID) |
2282 | { | 2283 | { |
2283 | Vector3 sitTargetPos = part.SitTargetPosition; | 2284 | Vector3 sitTargetPos = part.SitTargetPosition; |
2284 | Quaternion sitTargetOrient = part.SitTargetOrientation; | 2285 | Quaternion sitTargetOrient = part.SitTargetOrientation; |