diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 4f68817..2d01282 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -873,7 +873,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
873 | // TODO: determine position to sit at based on scene geometry; don't trust offset from client | 873 | // TODO: determine position to sit at based on scene geometry; don't trust offset from client |
874 | // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it | 874 | // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it |
875 | 875 | ||
876 | |||
877 | // Is a sit target available? | 876 | // Is a sit target available? |
878 | Vector3 avSitOffSet = part.GetSitTargetPosition(); | 877 | Vector3 avSitOffSet = part.GetSitTargetPosition(); |
879 | Quaternion avSitOrientation = part.GetSitTargetOrientation(); | 878 | Quaternion avSitOrientation = part.GetSitTargetOrientation(); |
@@ -893,15 +892,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
893 | autopilot = false; | 892 | autopilot = false; |
894 | } | 893 | } |
895 | 894 | ||
896 | |||
897 | pos = part.AbsolutePosition + offset; | 895 | pos = part.AbsolutePosition + offset; |
898 | 896 | ||
899 | if (m_physicsActor != null) | 897 | if (m_physicsActor != null) |
900 | { | 898 | { |
901 | // | ||
902 | // If we're not using the client autopilot, we're immediately warping the avatar to the location | 899 | // If we're not using the client autopilot, we're immediately warping the avatar to the location |
903 | // We can remove the physicsActor until they stand up. | 900 | // We can remove the physicsActor until they stand up. |
904 | // | ||
905 | m_sitAvatarHeight = m_physicsActor.Size.Z; | 901 | m_sitAvatarHeight = m_physicsActor.Size.Z; |
906 | 902 | ||
907 | if (autopilot) | 903 | if (autopilot) |
@@ -913,17 +909,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
913 | RemoveFromPhysicalScene(); | 909 | RemoveFromPhysicalScene(); |
914 | AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight); | 910 | AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight); |
915 | } | 911 | } |
916 | else | ||
917 | { | ||
918 | } | ||
919 | } | 912 | } |
920 | else | 913 | else |
921 | { | 914 | { |
922 | RemoveFromPhysicalScene(); | 915 | RemoveFromPhysicalScene(); |
923 | } | 916 | } |
924 | } // Physactor != null | 917 | } |
925 | } // part != null | 918 | } |
926 | |||
927 | 919 | ||
928 | avatarSitResponse.SitTransform.AutoPilot = autopilot; | 920 | avatarSitResponse.SitTransform.AutoPilot = autopilot; |
929 | avatarSitResponse.SitTransform.SitPosition = offset; | 921 | avatarSitResponse.SitTransform.SitPosition = offset; |