diff options
| author | Melanie Thielker | 2010-08-04 03:24:06 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-04 03:24:06 +0200 |
| commit | b38d69287a74314b34b5ca5867586c99f691fe2d (patch) | |
| tree | 1f9e838e51d628d72e75092a16f1b2cff3b612f3 /OpenSim | |
| parent | Remove StandAlone from default hardcoded config (diff) | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| download | opensim-SC_OLD-b38d69287a74314b34b5ca5867586c99f691fe2d.zip opensim-SC_OLD-b38d69287a74314b34b5ca5867586c99f691fe2d.tar.gz opensim-SC_OLD-b38d69287a74314b34b5ca5867586c99f691fe2d.tar.bz2 opensim-SC_OLD-b38d69287a74314b34b5ca5867586c99f691fe2d.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1fc4a81..d857a1c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1939,7 +1939,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1939 | Quaternion nrot = avSitOrientation; | 1939 | Quaternion nrot = avSitOrientation; |
| 1940 | if (!part.IsRoot) | 1940 | if (!part.IsRoot) |
| 1941 | { | 1941 | { |
| 1942 | nrot = nrot * part.RotationOffset; | 1942 | nrot = part.RotationOffset * avSitOrientation; |
| 1943 | } | 1943 | } |
| 1944 | sitOrientation = nrot; // Change rotatione to the scripted one | 1944 | sitOrientation = nrot; // Change rotatione to the scripted one |
| 1945 | OffsetRotation = nrot; | 1945 | OffsetRotation = nrot; |