aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-16 21:56:13 +0000
committerJustin Clarke Casey2009-01-16 21:56:13 +0000
commiteca6442bae4093019bd221e87413c74c77c4ff5d (patch)
treee62245b1cf2a5f0afdde443fba38c2b62d401100 /OpenSim/Region/Environment/Modules
parent* minor: Future archiver test stub (diff)
downloadopensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.zip
opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.gz
opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.bz2
opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.xz
* Rig up enough infrastructure to actually perform a successful 'standalone' teleport unit test with checks that the scene presence disappeared from sceneA and appeared in
sceneB * However, I'm not convinced that the actual process in the test completely reflects reality, and a lot of stuff had to be rigged up (which should get resolved over time)
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs9
2 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs
index 42a4e91..cfac868 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
61 agent.InventoryFolder = UUID.Zero; 61 agent.InventoryFolder = UUID.Zero;
62 agent.startpos = Vector3.Zero; 62 agent.startpos = Vector3.Zero;
63 agent.CapsPath = "http://wibble.com"; 63 agent.CapsPath = "http://wibble.com";
64 client = new TestClient(agent); 64 client = new TestClient(agent, null);
65 ts = new TextureSender(client, 0, 0); 65 ts = new TextureSender(client, 0, 0);
66 testsize = random.Next(5000,15000); 66 testsize = random.Next(5000,15000);
67 npackets = CalculateNumPackets(testsize); 67 npackets = CalculateNumPackets(testsize);
diff --git a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
index 5fcb4bc..62f6df0 100644
--- a/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/Environment/Modules/Communications/Local/LocalInterregionComms.cs
@@ -128,6 +128,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
128 return true; 128 return true;
129 } 129 }
130 } 130 }
131
131// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle); 132// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle);
132 return false; 133 return false;
133 } 134 }
@@ -138,12 +139,16 @@ namespace OpenSim.Region.Environment.Modules.Communications.Local
138 { 139 {
139 if (s.RegionInfo.RegionHandle == regionHandle) 140 if (s.RegionInfo.RegionHandle == regionHandle)
140 { 141 {
141 //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate"); 142 //m_log.DebugFormat(
143 // "[LOCAL COMMS]: Found region {0} {1} to send ChildAgentUpdate",
144 // s.RegionInfo.RegionName, regionHandle);
145
142 s.IncomingChildAgentDataUpdate(cAgentData); 146 s.IncomingChildAgentDataUpdate(cAgentData);
143 return true; 147 return true;
144 } 148 }
145 } 149 }
146 //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate"); 150
151// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for ChildAgentUpdate", regionHandle);
147 return false; 152 return false;
148 } 153 }
149 154