aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-23 01:12:20 +0000
committerJustin Clark-Casey (justincc)2013-11-23 01:12:20 +0000
commit9bdd3dc7de46507b490a2eae5160123a28133d63 (patch)
tree975e5cf09d87e3b1196592a739c8472582e0a56b
parentFix false positive test failure in TestRepeatSameDrawContainingImageReusingTe... (diff)
downloadopensim-SC_OLD-9bdd3dc7de46507b490a2eae5160123a28133d63.zip
opensim-SC_OLD-9bdd3dc7de46507b490a2eae5160123a28133d63.tar.gz
opensim-SC_OLD-9bdd3dc7de46507b490a2eae5160123a28133d63.tar.bz2
opensim-SC_OLD-9bdd3dc7de46507b490a2eae5160123a28133d63.tar.xz
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero
As far as I can see it's valid to change the eye offset even if you aren't changing the at target.
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 29751ff..1ac9d7f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2635,11 +2635,8 @@ 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 if (CameraAtOffset != Vector3.Zero) 2638 avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
2639 { 2639 avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
2640 avatarSitResponse.SitTransform.CameraAtOffset = CameraAtOffset;
2641 avatarSitResponse.SitTransform.CameraEyeOffset = CameraEyeOffset;
2642 }
2643 avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook; 2640 avatarSitResponse.SitTransform.ForceMouselook = ForceMouseLook;
2644 avatarSitResponse.SitTransform.AutoPilot = autopilot; 2641 avatarSitResponse.SitTransform.AutoPilot = autopilot;
2645 avatarSitResponse.SitTransform.SitPosition = OffsetPos; 2642 avatarSitResponse.SitTransform.SitPosition = OffsetPos;