aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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/Framework
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 '')
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs7
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 7a5e6b2..b54aafb 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Framework
179 return; 179 return;
180 } 180 }
181 181
182 m_log.Info("[CONFIG]: Calling Configuration Load Function..."); 182 //m_log.Debug("[CONFIG]: Calling Configuration Load Function...");
183 loadFunction(); 183 loadFunction();
184 184
185 if (configurationOptions.Count <= 0) 185 if (configurationOptions.Count <= 0)
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 0d44abd..63c09fe 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -814,7 +814,12 @@ namespace OpenSim.Framework
814 void SendWindData(Vector2[] windSpeeds); 814 void SendWindData(Vector2[] windSpeeds);
815 815
816 void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look); 816 void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
817 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint); 817 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
818
819 /// <summary>
820 /// Return circuit information for this client.
821 /// </summary>
822 /// <returns></returns>
818 AgentCircuitData RequestClientInfo(); 823 AgentCircuitData RequestClientInfo();
819 824
820 void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, 825 void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint,