From 5015b0b485058db5bf1f2b56cf375c23349749ad Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 May 2014 01:55:05 +0100
Subject: If one is sitting on a child with an unset camera-eye and so using
 one set in a root prim, the focus should remain on the root prim.

Matches behaviour just tested on the Linden grid.
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f067f9d..17f54c2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2755,15 +2755,19 @@ namespace OpenSim.Region.Framework.Scenes
 
                 cameraAtOffset = part.GetCameraAtOffset();
 
-                if (cameraAtOffset == Vector3.Zero)
+                if (!part.IsRoot && cameraAtOffset == Vector3.Zero)
                     cameraAtOffset = part.ParentGroup.RootPart.GetCameraAtOffset();
 
+                bool cameraEyeOffsetFromRootForChild = false;
                 cameraEyeOffset = part.GetCameraEyeOffset();
 
-                if (cameraEyeOffset == Vector3.Zero)
+                if (!part.IsRoot && cameraEyeOffset == Vector3.Zero)
+                {                 
                     cameraEyeOffset = part.ParentGroup.RootPart.GetCameraEyeOffset();
+                    cameraEyeOffsetFromRootForChild = true;
+                }
 
-                if (cameraEyeOffset != Vector3.Zero || cameraAtOffset != Vector3.Zero)
+                if ((cameraEyeOffset != Vector3.Zero && !cameraEyeOffsetFromRootForChild) || cameraAtOffset != Vector3.Zero)
                 {
                     if (!part.IsRoot)
                     {
-- 
cgit v1.1