diff options
| author | Justin Clark-Casey (justincc) | 2013-11-23 02:29:14 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-11-23 02:29:14 +0000 |
| commit | a68d1fad73f1b11ef5c1be84da0689586a2c7870 (patch) | |
| tree | c86fd5eae848fbce3cc1bb4cdb81cf39cbf5f9a7 /OpenSim | |
| parent | Revert "Fix non-root prim sit positions for prims where a sit target has been... (diff) | |
| download | opensim-SC_OLD-a68d1fad73f1b11ef5c1be84da0689586a2c7870.zip opensim-SC_OLD-a68d1fad73f1b11ef5c1be84da0689586a2c7870.tar.gz opensim-SC_OLD-a68d1fad73f1b11ef5c1be84da0689586a2c7870.tar.bz2 opensim-SC_OLD-a68d1fad73f1b11ef5c1be84da0689586a2c7870.tar.xz | |
Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero"
This reverts commit 9bdd3dc7de46507b490a2eae5160123a28133d63.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 1ac9d7f..29751ff 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -2635,8 +2635,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 2635 | { | 2635 | { |
| 2636 | AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); | 2636 | AvatarSitResponsePacket avatarSitResponse = new AvatarSitResponsePacket(); |
| 2637 | avatarSitResponse.SitObject.ID = TargetID; | 2637 | avatarSitResponse.SitObject.ID = TargetID; |
| 2638 | avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset; | 2638 | if (CameraAtOffset != Vector3.Zero) |
| 2639 | avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset; | 2639 | { |
| 2640 | avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset; | ||
| 2641 | avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset; | ||
| 2642 | } | ||
| 2640 | avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook; | 2643 | avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook; |
| 2641 | avatarSitResponse.SitTransform.AutoPilot = autopilot; | 2644 | avatarSitResponse.SitTransform.AutoPilot = autopilot; |
| 2642 | avatarSitResponse.SitTransform.SitPosition = OffsetPos; | 2645 | avatarSitResponse.SitTransform.SitPosition = OffsetPos; |