diff options
Diffstat (limited to '')
4 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 47548c7..fd28ba0 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -495,7 +495,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
495 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) | 495 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) |
496 | { | 496 | { |
497 | agent.CallbackURI = region.ServerURI + "agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; | 497 | agent.CallbackURI = region.ServerURI + "agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; |
498 | m_log.Debug("Set callback URL to " + agent.CallbackURI); | 498 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Set callback URL to {0}", agent.CallbackURI); |
499 | 499 | ||
500 | } | 500 | } |
501 | 501 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 7796a08..35dcd95 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
124 | { | 124 | { |
125 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID); | 125 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID); |
126 | GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID); | 126 | GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID); |
127 | m_log.Debug("GetfinalDestination serveruri -> " + real_destination.ServerURI); | 127 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: GetFinalDestination serveruri -> {0}", real_destination.ServerURI); |
128 | return real_destination; | 128 | return real_destination; |
129 | } | 129 | } |
130 | return region; | 130 | return region; |
@@ -151,7 +151,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
151 | 151 | ||
152 | protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) | 152 | protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) |
153 | { | 153 | { |
154 | m_log.Debug("CreateAgent " + reg.ServerURI + " " + finalDestination.ServerURI); | 154 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: CreateAgent {0} {1}", reg.ServerURI, finalDestination.ServerURI); |
155 | reason = string.Empty; | 155 | reason = string.Empty; |
156 | logout = false; | 156 | logout = false; |
157 | int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID); | 157 | int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID); |
@@ -238,9 +238,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
238 | string url = aCircuit.ServiceURLs["HomeURI"].ToString(); | 238 | string url = aCircuit.ServiceURLs["HomeURI"].ToString(); |
239 | IUserAgentService security = new UserAgentServiceConnector(url); | 239 | IUserAgentService security = new UserAgentServiceConnector(url); |
240 | return security.VerifyClient(aCircuit.SessionID, token); | 240 | return security.VerifyClient(aCircuit.SessionID, token); |
241 | } else { | 241 | } |
242 | m_log.Debug("this gent does not have a HomeURI OH NO"); | 242 | else |
243 | } | 243 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent {0} {1} does not have a HomeURI OH NO!", aCircuit.firstname, aCircuit.lastname); |
244 | 244 | ||
245 | return false; | 245 | return false; |
246 | } | 246 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fcfb4d7..9ade100 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3691,10 +3691,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3691 | } | 3691 | } |
3692 | 3692 | ||
3693 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 3693 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
3694 | m_log.Debug("ICADU -> post wait"); | 3694 | |
3695 | if (childAgentUpdate != null) | 3695 | if (childAgentUpdate != null) |
3696 | { | 3696 | { |
3697 | m_log.Debug("ICADU -> not child agent!"); | ||
3698 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); | 3697 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); |
3699 | return true; | 3698 | return true; |
3700 | } | 3699 | } |
@@ -3710,7 +3709,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3710 | /// <returns>true if we handled it.</returns> | 3709 | /// <returns>true if we handled it.</returns> |
3711 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) | 3710 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) |
3712 | { | 3711 | { |
3713 | m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); | 3712 | //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); |
3714 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); | 3713 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); |
3715 | if (childAgentUpdate != null) | 3714 | if (childAgentUpdate != null) |
3716 | { | 3715 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d88526f..a1c80e5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2933,7 +2933,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2933 | 2933 | ||
2934 | public void ChildAgentDataUpdate(AgentData cAgentData) | 2934 | public void ChildAgentDataUpdate(AgentData cAgentData) |
2935 | { | 2935 | { |
2936 | m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); | 2936 | //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); |
2937 | if (!IsChildAgent) | 2937 | if (!IsChildAgent) |
2938 | return; | 2938 | return; |
2939 | 2939 | ||