From 49d7ff0307087f7730742e97e2bb475449f9d7f5 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 26 Oct 2010 16:57:47 -0700 Subject: [PATCH] Avatars no longer snap to middle of target sim when border crossing in a CM --- .../RegionSync/RegionSyncModule/RegionSyncClient.cs | 7 ++++--- .../RegionSync/RegionSyncModule/RegionSyncClientView.cs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs index 79b4a31be1..d51b6f265e 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs @@ -878,7 +878,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule data["agentID"] = OSD.FromUUID(client.AgentId); data["first"] = OSD.FromString(client.FirstName); data["last"] = OSD.FromString(client.LastName); - data["startPos"] = OSD.FromVector3(client.StartPos); + // data["startPos"] = OSD.FromVector3(client.StartPos); + data["startPos"] = OSD.FromVector3(scenep.AbsolutePosition); Send(new RegionSyncMessage(RegionSyncMessage.MsgType.AgentAdd, OSDParser.SerializeJsonString(data))); // Register for interesting client events which will be forwarded to auth sim @@ -1047,7 +1048,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule public void HandleStartAnim(IClientAPI remoteClient, UUID animID) { // m_log.DebugFormat("[REGION SYNC CLIENT] HandleStartAnim for {0}", remoteClient.AgentId.ToString()); - OSDMap data = new OSDMap(3); + OSDMap data = new OSDMap(2); data["agentID"] = OSD.FromUUID(remoteClient.AgentId); data["id"] = OSD.FromUUID(animID); Send(new RegionSyncMessage(RegionSyncMessage.MsgType.StartAnim, OSDParser.SerializeJsonString(data))); @@ -1056,7 +1057,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule public void HandleStopAnim(IClientAPI remoteClient, UUID animID) { // m_log.DebugFormat("[REGION SYNC CLIENT] HandleStopAnim for {0}", remoteClient.AgentId.ToString()); - OSDMap data = new OSDMap(3); + OSDMap data = new OSDMap(2); data["agentID"] = OSD.FromUUID(remoteClient.AgentId); data["id"] = OSD.FromUUID(animID); Send(new RegionSyncMessage(RegionSyncMessage.MsgType.StopAnim, OSDParser.SerializeJsonString(data))); diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs index 509a29add1..07aa077dca 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs @@ -362,7 +362,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule m_syncedAvatars.Add(agentID, av); } m_scene.AddNewClient(av); - RegionSyncMessage.HandleSuccess(LogHeader, msg, String.Format("Handled AddAgent for UUID {0}", agentID)); + RegionSyncMessage.HandleSuccess(LogHeader, msg, String.Format("Handled AddAgent for UUID {0} at {1}", agentID, startPos.ToString())); return; } }