diff options
| author | Melanie | 2012-03-04 16:23:46 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-04 16:23:46 +0000 |
| commit | 182f5efbe94881c22af82bc71566c49dd02ed8f8 (patch) | |
| tree | 2b26c2657cfb91464008d8e305566500bc3cdd9e /OpenSim/Region/ClientStack/Linden | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Zero velocity when drag-copying (diff) | |
| download | opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.zip opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.gz opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.bz2 opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2e86315..f835e56 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -4845,7 +4845,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4845 | if (part != null && part != part.ParentGroup.RootPart) | 4845 | if (part != null && part != part.ParentGroup.RootPart) |
| 4846 | { | 4846 | { |
| 4847 | position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset; | 4847 | position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset; |
| 4848 | rotation = presence.Rotation * part.RotationOffset; | 4848 | rotation = part.RotationOffset * presence.Rotation; |
| 4849 | } | 4849 | } |
| 4850 | } | 4850 | } |
| 4851 | 4851 | ||
| @@ -4974,7 +4974,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4974 | if (part != null && part != part.ParentGroup.RootPart) | 4974 | if (part != null && part != part.ParentGroup.RootPart) |
| 4975 | { | 4975 | { |
| 4976 | offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset; | 4976 | offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset; |
| 4977 | rotation = data.Rotation * part.RotationOffset; | 4977 | rotation = part.RotationOffset * data.Rotation; |
| 4978 | parentID = part.ParentGroup.RootPart.LocalId; | 4978 | parentID = part.ParentGroup.RootPart.LocalId; |
| 4979 | } | 4979 | } |
| 4980 | } | 4980 | } |