diff options
author | diva | 2009-01-03 02:29:49 +0000 |
---|---|---|
committer | diva | 2009-01-03 02:29:49 +0000 |
commit | 4144fd0eb2ea93b9bb83b7ab81780fd00c999c82 (patch) | |
tree | 601fbe1847eda7cfa828ac0532175af6ea040bc3 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |
parent | Plumb in dwell in a couple of places (diff) | |
download | opensim-SC-4144fd0eb2ea93b9bb83b7ab81780fd00c999c82.zip opensim-SC-4144fd0eb2ea93b9bb83b7ab81780fd00c999c82.tar.gz opensim-SC-4144fd0eb2ea93b9bb83b7ab81780fd00c999c82.tar.bz2 opensim-SC-4144fd0eb2ea93b9bb83b7ab81780fd00c999c82.tar.xz |
Split agent updates into two messages: full update and position+camera update. They're both sent over HTTP PUT. The full update is sent on TPs, for now; later it will also be sent on region crossings.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index da3a9d3..8b3ac4f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -538,7 +538,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
538 | //bool val = m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region)); | 538 | //bool val = m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region)); |
539 | } | 539 | } |
540 | 540 | ||
541 | public delegate void SendChildAgentDataUpdateDelegate(AgentData cAgentData, ulong regionHandle); | 541 | public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, ulong regionHandle); |
542 | 542 | ||
543 | /// <summary> | 543 | /// <summary> |
544 | /// This informs all neighboring regions about the settings of it's child agent. | 544 | /// This informs all neighboring regions about the settings of it's child agent. |
@@ -547,7 +547,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
547 | /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc. | 547 | /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc. |
548 | /// | 548 | /// |
549 | /// </summary> | 549 | /// </summary> |
550 | private void SendChildAgentDataUpdateAsync(AgentData cAgentData, ulong regionHandle) | 550 | private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, ulong regionHandle) |
551 | { | 551 | { |
552 | //m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName); | 552 | //m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName); |
553 | try | 553 | try |
@@ -577,7 +577,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
577 | icon.EndInvoke(iar); | 577 | icon.EndInvoke(iar); |
578 | } | 578 | } |
579 | 579 | ||
580 | public void SendChildAgentDataUpdate(AgentData cAgentData, ScenePresence presence) | 580 | public void SendChildAgentDataUpdate(AgentPosition cAgentData, ScenePresence presence) |
581 | { | 581 | { |
582 | // This assumes that we know what our neighbors are. | 582 | // This assumes that we know what our neighbors are. |
583 | try | 583 | try |
@@ -847,7 +847,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
847 | // Let's send a full update of the agent. This is a synchronous call. | 847 | // Let's send a full update of the agent. This is a synchronous call. |
848 | AgentData agent = new AgentData(); | 848 | AgentData agent = new AgentData(); |
849 | avatar.CopyTo(agent); | 849 | avatar.CopyTo(agent); |
850 | agent.Position = new Vector3(-1, -1, -1); // this means ignore position info; UGH!!!! | 850 | agent.Position = position; |
851 | agent.CallbackURI = "http://" + m_regionInfo.ExternalHostName + ":" + m_regionInfo.HttpPort + | 851 | agent.CallbackURI = "http://" + m_regionInfo.ExternalHostName + ":" + m_regionInfo.HttpPort + |
852 | "/agent/" + avatar.UUID.ToString() + "/" + avatar.Scene.RegionInfo.RegionHandle.ToString() + "/release/"; | 852 | "/agent/" + avatar.UUID.ToString() + "/" + avatar.Scene.RegionInfo.RegionHandle.ToString() + "/release/"; |
853 | 853 | ||