diff options
author | Justin Clark-Casey (justincc) | 2014-05-22 23:52:28 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-05-22 23:52:28 +0100 |
commit | 3fbaef9275dbb1767dc734e2d8dbe1d2cabfb566 (patch) | |
tree | 1fb33f249d2652932a00cc66d7ca3a1ba6c40655 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Fix issue where llSetCameraAtOffset() and llSetCameraEyeOffset() in non-root ... (diff) | |
download | opensim-SC_OLD-3fbaef9275dbb1767dc734e2d8dbe1d2cabfb566.zip opensim-SC_OLD-3fbaef9275dbb1767dc734e2d8dbe1d2cabfb566.tar.gz opensim-SC_OLD-3fbaef9275dbb1767dc734e2d8dbe1d2cabfb566.tar.bz2 opensim-SC_OLD-3fbaef9275dbb1767dc734e2d8dbe1d2cabfb566.tar.xz |
If the root prim has a camera-at or camera-eye setting and a sat upon child prim does not, use the root prim offsets.
This matches behaviour just tested on the Linden Lab grid.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ed107e4..026b0b6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2754,8 +2754,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2754 | part.AddSittingAvatar(this); | 2754 | part.AddSittingAvatar(this); |
2755 | 2755 | ||
2756 | cameraAtOffset = part.GetCameraAtOffset(); | 2756 | cameraAtOffset = part.GetCameraAtOffset(); |
2757 | |||
2758 | if (cameraAtOffset == Vector3.Zero) | ||
2759 | cameraAtOffset = part.ParentGroup.RootPart.GetCameraAtOffset(); | ||
2760 | |||
2757 | cameraEyeOffset = part.GetCameraEyeOffset(); | 2761 | cameraEyeOffset = part.GetCameraEyeOffset(); |
2758 | 2762 | ||
2763 | if (cameraEyeOffset == Vector3.Zero) | ||
2764 | cameraEyeOffset = part.ParentGroup.RootPart.GetCameraEyeOffset(); | ||
2765 | |||
2759 | if (cameraEyeOffset != Vector3.Zero || cameraAtOffset != Vector3.Zero) | 2766 | if (cameraEyeOffset != Vector3.Zero || cameraAtOffset != Vector3.Zero) |
2760 | cameraEyeOffset += part.OffsetPosition; | 2767 | cameraEyeOffset += part.OffsetPosition; |
2761 | 2768 | ||