aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-11-08 23:15:09 +0100
committerMelanie2011-11-08 23:15:09 +0100
commitd40d0e45964444e0a95e400c5d14e0fc647058a6 (patch)
treea8ea6826033b8d4772fc7d51b0f5d4a91b197078
parentMerge branch 'master' into bigmerge (diff)
downloadopensim-SC_OLD-d40d0e45964444e0a95e400c5d14e0fc647058a6.zip
opensim-SC_OLD-d40d0e45964444e0a95e400c5d14e0fc647058a6.tar.gz
opensim-SC_OLD-d40d0e45964444e0a95e400c5d14e0fc647058a6.tar.bz2
opensim-SC_OLD-d40d0e45964444e0a95e400c5d14e0fc647058a6.tar.xz
Fix the ability to move the seated avatar via LSL
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index eb3597d..e2c68fd 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1914,6 +1914,7 @@ namespace OpenSim.Region.Framework.Scenes
1914 if (part.SitTargetAvatar == UUID) 1914 if (part.SitTargetAvatar == UUID)
1915 part.SitTargetAvatar = UUID.Zero; 1915 part.SitTargetAvatar = UUID.Zero;
1916 1916
1917 part.ParentGroup.DeleteAvatar(UUID);
1917 ParentPosition = part.GetWorldPosition(); 1918 ParentPosition = part.GetWorldPosition();
1918 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 1919 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
1919 } 1920 }
@@ -2343,11 +2344,13 @@ namespace OpenSim.Region.Framework.Scenes
2343 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT; 2344 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
2344 Rotation = sitTargetOrient; 2345 Rotation = sitTargetOrient;
2345 ParentPosition = part.AbsolutePosition; 2346 ParentPosition = part.AbsolutePosition;
2347 part.ParentGroup.AddAvatar(UUID);
2346 } 2348 }
2347 else 2349 else
2348 { 2350 {
2349 m_pos -= part.AbsolutePosition; 2351 m_pos -= part.AbsolutePosition;
2350 ParentPosition = part.AbsolutePosition; 2352 ParentPosition = part.AbsolutePosition;
2353 part.ParentGroup.AddAvatar(UUID);
2351 2354
2352// m_log.DebugFormat( 2355// m_log.DebugFormat(
2353// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target", 2356// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",