From 16bf38e1abd3a6235008a38ba7ca29e836c925c7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 May 2014 23:39:22 +0100
Subject: 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
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim')

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
 
                 cameraAtOffset = part.GetCameraAtOffset();
                 cameraEyeOffset = part.GetCameraEyeOffset();
+
+                if (cameraEyeOffset != Vector3.Zero || cameraAtOffset != Vector3.Zero)
+                    cameraEyeOffset += part.OffsetPosition;
+
                 forceMouselook = part.GetForceMouselook();
 
                 // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
-- 
cgit v1.1