diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index b24ee8a..221da0e 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1129,6 +1129,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1129 | bool autopilot = true; | 1129 | bool autopilot = true; |
1130 | LLVector3 pos = new LLVector3(); | 1130 | LLVector3 pos = new LLVector3(); |
1131 | LLQuaternion sitOrientation = new LLQuaternion(0, 0, 0, 1); | 1131 | LLQuaternion sitOrientation = new LLQuaternion(0, 0, 0, 1); |
1132 | LLVector3 cameraEyeOffset = LLVector3.Zero; | ||
1133 | LLVector3 cameraAtOffset = LLVector3.Zero; | ||
1134 | bool forceMouselook = false; | ||
1132 | 1135 | ||
1133 | //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); | 1136 | //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); |
1134 | SceneObjectPart part = FindNextAvailableSitTarget(targetID); | 1137 | SceneObjectPart part = FindNextAvailableSitTarget(targetID); |
@@ -1183,9 +1186,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1183 | RemoveFromPhysicalScene(); | 1186 | RemoveFromPhysicalScene(); |
1184 | } | 1187 | } |
1185 | } | 1188 | } |
1189 | |||
1190 | cameraAtOffset = part.GetCameraAtOffset(); | ||
1191 | cameraEyeOffset = part.GetCameraEyeOffset(); | ||
1192 | forceMouselook = part.GetForceMouselook(); | ||
1186 | } | 1193 | } |
1187 | 1194 | ||
1188 | ControllingClient.SendSitResponse(targetID, offset, sitOrientation, autopilot, LLVector3.Zero, LLVector3.Zero, false); | 1195 | ControllingClient.SendSitResponse(targetID, offset, sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook); |
1189 | m_requestedSitTargetUUID = targetID; | 1196 | m_requestedSitTargetUUID = targetID; |
1190 | // This calls HandleAgentSit twice, once from here, and the client calls | 1197 | // This calls HandleAgentSit twice, once from here, and the client calls |
1191 | // HandleAgentSit itself after it gets to the location | 1198 | // HandleAgentSit itself after it gets to the location |