aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey2014-08-02 01:04:58 +0100
committerJustin Clark-Casey2014-08-02 01:04:58 +0100
commit4640281e57b5ca6ca918c0b183166e08c747f577 (patch)
tree2721ccd01a8cf672a309052950e11eeabb5dc354
parentIf REMOVEAGENTFROMGROUP core groups call fails because requesting agent does ... (diff)
downloadopensim-SC_OLD-4640281e57b5ca6ca918c0b183166e08c747f577.zip
opensim-SC_OLD-4640281e57b5ca6ca918c0b183166e08c747f577.tar.gz
opensim-SC_OLD-4640281e57b5ca6ca918c0b183166e08c747f577.tar.bz2
opensim-SC_OLD-4640281e57b5ca6ca918c0b183166e08c747f577.tar.xz
Add conflict resolution that should have been done in conflict resolution of 4e3a2d3a64817e41bda18f4d39ca7e6940c69d98
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs12
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 00c0ff8..7ef83c0 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -821,14 +821,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
821 agentCircuit.Id0 = currentAgentCircuit.Id0; 821 agentCircuit.Id0 = currentAgentCircuit.Id0;
822 } 822 }
823 823
824<<<<<<< HEAD
825 if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
826=======
827 // if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY)) 824 // if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
828 float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, 825 float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
829 (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY)); 826 (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
830 if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY)) 827 if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
831>>>>>>> d99c8e6... It turns out that child agent management has had a bug for a while: there was an inconsistency in the scope between opening and closing child agents in neighboring regions. For opening (in EnableChildAgents), the region's DrawDistance was being used; for closing (in IsOUtsideView) , the viewer's (SP) DrawDistance was being used. This fixes this inconsistency, therefore eliminating bugs observed in TPs between, at least, neighboring varregions.
832 { 828 {
833 // brand new agent, let's create a new caps seed 829 // brand new agent, let's create a new caps seed
834 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); 830 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
@@ -902,13 +898,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
902 898
903 IClientIPEndpoint ipepClient; 899 IClientIPEndpoint ipepClient;
904 string capsPath = String.Empty; 900 string capsPath = String.Empty;
905<<<<<<< HEAD
906 if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
907=======
908 float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, 901 float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
909 (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY)); 902 (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
910 if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY)) 903 if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
911>>>>>>> d99c8e6... It turns out that child agent management has had a bug for a while: there was an inconsistency in the scope between opening and closing child agents in neighboring regions. For opening (in EnableChildAgents), the region's DrawDistance was being used; for closing (in IsOUtsideView) , the viewer's (SP) DrawDistance was being used. This fixes this inconsistency, therefore eliminating bugs observed in TPs between, at least, neighboring varregions.
912 { 904 {
913 m_log.DebugFormat( 905 m_log.DebugFormat(
914 "[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}",
@@ -1154,13 +1146,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1154 1146
1155 IClientIPEndpoint ipepClient; 1147 IClientIPEndpoint ipepClient;
1156 string capsPath = String.Empty; 1148 string capsPath = String.Empty;
1157<<<<<<< HEAD
1158 if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
1159=======
1160 float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, 1149 float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
1161 (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY)); 1150 (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
1162 if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY)) 1151 if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
1163>>>>>>> d99c8e6... It turns out that child agent management has had a bug for a while: there was an inconsistency in the scope between opening and closing child agents in neighboring regions. For opening (in EnableChildAgents), the region's DrawDistance was being used; for closing (in IsOUtsideView) , the viewer's (SP) DrawDistance was being used. This fixes this inconsistency, therefore eliminating bugs observed in TPs between, at least, neighboring varregions.
1164 { 1152 {
1165 m_log.DebugFormat( 1153 m_log.DebugFormat(
1166 "[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}",