ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
This matches behaviour just tested on the Linden Lab grid.
This commit is contained in:
Justin Clark-Casey (justincc)
2014-05-22 23:52:28 +01:00
parent 16bf38e1ab
commit 3fbaef9275
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -2754,8 +2754,15 @@ namespace OpenSim.Region.Framework.Scenes
part.AddSittingAvatar(this); part.AddSittingAvatar(this);
cameraAtOffset = part.GetCameraAtOffset(); cameraAtOffset = part.GetCameraAtOffset();
if (cameraAtOffset == Vector3.Zero)
cameraAtOffset = part.ParentGroup.RootPart.GetCameraAtOffset();
cameraEyeOffset = part.GetCameraEyeOffset(); cameraEyeOffset = part.GetCameraEyeOffset();
if (cameraEyeOffset == Vector3.Zero)
cameraEyeOffset = part.ParentGroup.RootPart.GetCameraEyeOffset();
if (cameraEyeOffset != Vector3.Zero || cameraAtOffset != Vector3.Zero) if (cameraEyeOffset != Vector3.Zero || cameraAtOffset != Vector3.Zero)
cameraEyeOffset += part.OffsetPosition; cameraEyeOffset += part.OffsetPosition;