aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-22 23:39:22 +0100
committerJustin Clark-Casey (justincc)2014-05-22 23:39:22 +0100
commit16bf38e1abd3a6235008a38ba7ca29e836c925c7 (patch)
treeeb0330d399048d29f01fb3b9a5b52f3d80363a2e /OpenSim/Region/Framework/Scenes
parentAdd regression test for north-south chat across neighbour regions. (diff)
downloadopensim-SC_OLD-16bf38e1abd3a6235008a38ba7ca29e836c925c7.zip
opensim-SC_OLD-16bf38e1abd3a6235008a38ba7ca29e836c925c7.tar.gz
opensim-SC_OLD-16bf38e1abd3a6235008a38ba7ca29e836c925c7.tar.bz2
opensim-SC_OLD-16bf38e1abd3a6235008a38ba7ca29e836c925c7.tar.xz
Fix issue where llSetCameraAtOffset() and llSetCameraEyeOffset() in non-root prims moved camera/focus to wrong position.
For non-root prim, eye offsets now need to be made relative to root prim if either camera-at or camera-eye are set. Probably a regression since November 2013 when all sits were made relative to root prim to match viewer expections (and fix other bugs). Addresses http://opensimulator.org/mantis/view.php?id=7176
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 398d394..ed107e4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2755,6 +2755,10 @@ namespace OpenSim.Region.Framework.Scenes
2755 2755
2756 cameraAtOffset = part.GetCameraAtOffset(); 2756 cameraAtOffset = part.GetCameraAtOffset();
2757 cameraEyeOffset = part.GetCameraEyeOffset(); 2757 cameraEyeOffset = part.GetCameraEyeOffset();
2758
2759 if (cameraEyeOffset != Vector3.Zero || cameraAtOffset != Vector3.Zero)
2760 cameraEyeOffset += part.OffsetPosition;
2761
2758 forceMouselook = part.GetForceMouselook(); 2762 forceMouselook = part.GetForceMouselook();
2759 2763
2760 // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is 2764 // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is