diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c8f28c7..e4bee0c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1129,13 +1129,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
1129 | public Quaternion SitTargetOrientation | 1129 | public Quaternion SitTargetOrientation |
1130 | { | 1130 | { |
1131 | get { return m_sitTargetOrientation; } | 1131 | get { return m_sitTargetOrientation; } |
1132 | set { m_sitTargetOrientation = value; } | 1132 | set |
1133 | { | ||
1134 | m_sitTargetOrientation = value; | ||
1135 | // m_log.DebugFormat("[SCENE OBJECT PART]: Set sit target orientation {0} for {1} {2}", m_sitTargetOrientation, Name, LocalId); | ||
1136 | } | ||
1133 | } | 1137 | } |
1134 | 1138 | ||
1135 | public Vector3 SitTargetPosition | 1139 | public Vector3 SitTargetPosition |
1136 | { | 1140 | { |
1137 | get { return m_sitTargetPosition; } | 1141 | get { return m_sitTargetPosition; } |
1138 | set { m_sitTargetPosition = value; } | 1142 | set |
1143 | { | ||
1144 | m_sitTargetPosition = value; | ||
1145 | // m_log.DebugFormat("[SCENE OBJECT PART]: Set sit target position to {0} for {1} {2}", m_sitTargetPosition, Name, LocalId); | ||
1146 | } | ||
1139 | } | 1147 | } |
1140 | 1148 | ||
1141 | // This sort of sucks, but I'm adding these in to make some of | 1149 | // This sort of sucks, but I'm adding these in to make some of |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1c892fe..b95d613 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
92 | /// </summary> | 92 | /// </summary> |
93 | // private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f); | 93 | // private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f); |
94 | // Value revised by KF 091121 by comparison with SL. | 94 | // Value revised by KF 091121 by comparison with SL. |
95 | private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f); | 95 | public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f); |
96 | 96 | ||
97 | /// <summary> | 97 | /// <summary> |
98 | /// Movement updates for agents in neighboring regions are sent directly to clients. | 98 | /// Movement updates for agents in neighboring regions are sent directly to clients. |
@@ -2617,7 +2617,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2617 | RemoveFromPhysicalScene(); | 2617 | RemoveFromPhysicalScene(); |
2618 | Animator.TrySetMovementAnimation(sitAnimation); | 2618 | Animator.TrySetMovementAnimation(sitAnimation); |
2619 | SendAvatarDataToAllAgents(); | 2619 | SendAvatarDataToAllAgents(); |
2620 | //SendTerseUpdateToAllClients(); | ||
2621 | } | 2620 | } |
2622 | 2621 | ||
2623 | public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal) | 2622 | public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal) |