diff options
author | Justin Clark-Casey (justincc) | 2013-11-23 02:31:39 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-11-23 02:31:39 +0000 |
commit | 60e049ea39f9b347ac1395c2373d17a983ab7ff3 (patch) | |
tree | 759e0a9067cb382d68cd6b01339f5c2256644c63 /OpenSim/Region/Framework/Scenes | |
parent | Revert "Add line accidentally left out of recent non-root prim sit fix" (diff) | |
download | opensim-SC_OLD-60e049ea39f9b347ac1395c2373d17a983ab7ff3.zip opensim-SC_OLD-60e049ea39f9b347ac1395c2373d17a983ab7ff3.tar.gz opensim-SC_OLD-60e049ea39f9b347ac1395c2373d17a983ab7ff3.tar.bz2 opensim-SC_OLD-60e049ea39f9b347ac1395c2373d17a983ab7ff3.tar.xz |
Revert "Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook"
Reverting to place on separate branch
This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ea8e4fe..7243db1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2312,10 +2312,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2312 | cameraEyeOffset = part.GetCameraEyeOffset(); | 2312 | cameraEyeOffset = part.GetCameraEyeOffset(); |
2313 | forceMouselook = part.GetForceMouselook(); | 2313 | forceMouselook = part.GetForceMouselook(); |
2314 | 2314 | ||
2315 | // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is | ||
2316 | // being sat upon. | ||
2317 | ControllingClient.SendSitResponse( | 2315 | ControllingClient.SendSitResponse( |
2318 | part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); | 2316 | part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); |
2319 | 2317 | ||
2320 | m_requestedSitTargetUUID = part.UUID; | 2318 | m_requestedSitTargetUUID = part.UUID; |
2321 | 2319 | ||
@@ -2594,10 +2592,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2594 | } | 2592 | } |
2595 | else | 2593 | else |
2596 | { | 2594 | { |
2597 | // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is | 2595 | m_pos -= part.AbsolutePosition; |
2598 | // being sat upon. | ||
2599 | m_pos -= part.GroupPosition; | ||
2600 | |||
2601 | ParentPosition = part.AbsolutePosition; | 2596 | ParentPosition = part.AbsolutePosition; |
2602 | 2597 | ||
2603 | // m_log.DebugFormat( | 2598 | // m_log.DebugFormat( |