diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 7c3d50b..9abc8ae 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -822,7 +822,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
822 | } | 822 | } |
823 | 823 | ||
824 | // if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY)) | 824 | // if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY)) |
825 | if (NeedsNewAgent(sp.Scene.DefaultDrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY)) | 825 | float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, |
826 | (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY)); | ||
827 | if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY)) | ||
826 | { | 828 | { |
827 | // brand new agent, let's create a new caps seed | 829 | // brand new agent, let's create a new caps seed |
828 | agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 830 | agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |
@@ -896,7 +898,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
896 | 898 | ||
897 | IClientIPEndpoint ipepClient; | 899 | IClientIPEndpoint ipepClient; |
898 | string capsPath = String.Empty; | 900 | string capsPath = String.Empty; |
899 | if (NeedsNewAgent(sp.Scene.DefaultDrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY)) | 901 | float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, |
902 | (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY)); | ||
903 | if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY)) | ||
900 | { | 904 | { |
901 | m_log.DebugFormat( | 905 | m_log.DebugFormat( |
902 | "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for incoming agent {3} from {4}", | 906 | "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for incoming agent {3} from {4}", |
@@ -1142,7 +1146,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1142 | 1146 | ||
1143 | IClientIPEndpoint ipepClient; | 1147 | IClientIPEndpoint ipepClient; |
1144 | string capsPath = String.Empty; | 1148 | string capsPath = String.Empty; |
1145 | if (NeedsNewAgent(sp.Scene.DefaultDrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY)) | 1149 | float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, |
1150 | (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY)); | ||
1151 | if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY)) | ||
1146 | { | 1152 | { |
1147 | m_log.DebugFormat( | 1153 | m_log.DebugFormat( |
1148 | "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for agent {3} from {4}", | 1154 | "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for agent {3} from {4}", |