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.

1 files changed, 7 insertions, 3 deletions

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)
                     {