aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-23 01:38:05 +0100
committerJustin Clark-Casey (justincc)2014-05-23 01:38:05 +0100
commitc78a8271c44c581e4c939fa6347fd967ffdee847 (patch)
tree0e36cd7805726166b0128c2592812d047f797acb /OpenSim
parentCompensate camera-at and camera-eye for child prim rotation when sitting on c... (diff)
downloadopensim-SC_OLD-c78a8271c44c581e4c939fa6347fd967ffdee847.zip
opensim-SC_OLD-c78a8271c44c581e4c939fa6347fd967ffdee847.tar.gz
opensim-SC_OLD-c78a8271c44c581e4c939fa6347fd967ffdee847.tar.bz2
opensim-SC_OLD-c78a8271c44c581e4c939fa6347fd967ffdee847.tar.xz
Add any camera at compensation for sat upon child prims to any existing camera-at value, rather than replace.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index eaac71d..f067f9d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2768,7 +2768,7 @@ namespace OpenSim.Region.Framework.Scenes
2768 if (!part.IsRoot) 2768 if (!part.IsRoot)
2769 { 2769 {
2770 cameraEyeOffset = cameraEyeOffset * part.RotationOffset; 2770 cameraEyeOffset = cameraEyeOffset * part.RotationOffset;
2771 cameraAtOffset = part.OffsetPosition; 2771 cameraAtOffset += part.OffsetPosition;
2772 } 2772 }
2773 2773
2774 cameraEyeOffset += part.OffsetPosition; 2774 cameraEyeOffset += part.OffsetPosition;