diff options
| author | Justin Clark-Casey (justincc) | 2013-11-23 02:31:17 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-23 02:31:17 +0000 |
| commit | 1999b218fd679166d64c9c7bfabb0c16fbf8aa92 (patch) | |
| tree | 8bee8e081cf63a98eee22f8b2affa32e97ca41ff /OpenSim | |
| parent | Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset is... (diff) | |
| download | opensim-SC_OLD-1999b218fd679166d64c9c7bfabb0c16fbf8aa92.zip opensim-SC_OLD-1999b218fd679166d64c9c7bfabb0c16fbf8aa92.tar.gz opensim-SC_OLD-1999b218fd679166d64c9c7bfabb0c16fbf8aa92.tar.bz2 opensim-SC_OLD-1999b218fd679166d64c9c7bfabb0c16fbf8aa92.tar.xz | |
Revert "Add line accidentally left out of recent non-root prim sit fix"
Reverting to place on new branch
This reverts commit ed1029712a85206430fee1d4897d473517728dab.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 17b6126..ea8e4fe 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2314,8 +2314,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2314 | 2314 | ||
| 2315 | // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is | 2315 | // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is |
| 2316 | // being sat upon. | 2316 | // being sat upon. |
| 2317 | offset += part.OffsetPosition; | ||
| 2318 | |||
| 2319 | ControllingClient.SendSitResponse( | 2317 | ControllingClient.SendSitResponse( |
| 2320 | part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); | 2318 | part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); |
| 2321 | 2319 | ||