diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
commit | fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075 (patch) | |
tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |
parent | Merge remote branch 'otakup0pe/mantis5110' (diff) | |
download | opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.zip opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.gz opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.bz2 opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.xz |
Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 9a275ae..1ac7508 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -123,9 +123,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
123 | if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0) | 123 | if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0) |
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 | return m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID); |
127 | m_log.Debug("GetfinalDestination serveruri -> " + real_destination.ServerURI); | ||
128 | return real_destination; | ||
129 | } | 127 | } |
130 | return region; | 128 | return region; |
131 | } | 129 | } |
@@ -151,7 +149,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
151 | 149 | ||
152 | protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) | 150 | protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) |
153 | { | 151 | { |
154 | m_log.Debug("CreateAgent " + reg.ServerURI + " " + finalDestination.ServerURI); | ||
155 | reason = string.Empty; | 152 | reason = string.Empty; |
156 | logout = false; | 153 | logout = false; |
157 | int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID); | 154 | int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID); |