aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
2 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index db60ae3..a109d68 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3264,13 +3264,6 @@ namespace OpenSim.Region.Framework.Scenes
3264 //} 3264 //}
3265 } 3265 }
3266 3266
3267 public void SetAvatarOnSitTarget(UUID avatarID)
3268 {
3269 m_sitTargetAvatar = avatarID;
3270 if (ParentGroup != null)
3271 ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
3272 }
3273
3274 public void SetAxisRotation(int axis, int rotate) 3267 public void SetAxisRotation(int axis, int rotate)
3275 { 3268 {
3276 if (m_parentGroup != null) 3269 if (m_parentGroup != null)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 961fe29..6ad6522 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1836,7 +1836,10 @@ namespace OpenSim.Region.Framework.Scenes
1836 part.TaskInventory.LockItemsForRead(false); 1836 part.TaskInventory.LockItemsForRead(false);
1837 // Reset sit target. 1837 // Reset sit target.
1838 if (part.GetAvatarOnSitTarget() == UUID) 1838 if (part.GetAvatarOnSitTarget() == UUID)
1839 part.SetAvatarOnSitTarget(UUID.Zero); 1839 part.SitTargetAvatar = UUID.Zero;
1840 if (part.ParentGroup != null)
1841 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1842
1840 m_parentPosition = part.GetWorldPosition(); 1843 m_parentPosition = part.GetWorldPosition();
1841 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 1844 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
1842 } 1845 }
@@ -1986,7 +1989,7 @@ namespace OpenSim.Region.Framework.Scenes
1986 if (!part.IsOccupied) 1989 if (!part.IsOccupied)
1987 { 1990 {
1988//Console.WriteLine("Scripted, unoccupied"); 1991//Console.WriteLine("Scripted, unoccupied");
1989 part.SetAvatarOnSitTarget(UUID); // set that Av will be on it 1992 part.SitTargetAvatar = UUID; // set that Av will be on it
1990 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); // change ofset to the scripted one 1993 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); // change ofset to the scripted one
1991 1994
1992 Quaternion nrot = avSitOrientation; 1995 Quaternion nrot = avSitOrientation;