aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs20
4 files changed, 13 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index f533553..fcb3f5b 100644
--- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
45{ 45{
46 public class RESTInterregionComms : IRegionModule, IInterregionCommsOut 46 public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
47 { 47 {
48 private static bool initialized = false; 48 private bool initialized = false;
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 50
51 protected bool m_enabled = false; 51 protected bool m_enabled = false;
@@ -78,7 +78,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
78 return; 78 return;
79 79
80 InitEach(scene); 80 InitEach(scene);
81
82 } 81 }
83 82
84 public virtual void PostInitialise() 83 public virtual void PostInitialise()
@@ -162,7 +161,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
162 //else 161 //else
163 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); 162 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
164 return false; 163 return false;
165
166 } 164 }
167 165
168 public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData) 166 public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData)
@@ -180,7 +178,6 @@ namespace OpenSim.Region.CoreModules.Communications.REST
180 //else 178 //else
181 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle); 179 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
182 return false; 180 return false;
183
184 } 181 }
185 182
186 public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri) 183 public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 2fe96a2..c49a1f6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
221 [Test] 221 [Test]
222 public void TestMergeOarV0p2() 222 public void TestMergeOarV0p2()
223 { 223 {
224 XmlConfigurator.Configure(); 224 //XmlConfigurator.Configure();
225 225
226 MemoryStream archiveWriteStream = new MemoryStream(); 226 MemoryStream archiveWriteStream = new MemoryStream();
227 227
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 611b9db..c31e6f7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3750,7 +3750,7 @@ namespace OpenSim.Region.Framework.Scenes
3750 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); 3750 SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene);
3751 if (jointProxyObject != null) 3751 if (jointProxyObject != null)
3752 { 3752 {
3753 SimChat(Utils.StringToBytes("[NINJA] " + message), 3753 SimChat(Utils.StringToBytes("[NINJA]: " + message),
3754 ChatTypeEnum.DebugChannel, 3754 ChatTypeEnum.DebugChannel,
3755 2147483647, 3755 2147483647,
3756 jointProxyObject.AbsolutePosition, 3756 jointProxyObject.AbsolutePosition,
@@ -3762,7 +3762,7 @@ namespace OpenSim.Region.Framework.Scenes
3762 3762
3763 if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages) 3763 if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages)
3764 { 3764 {
3765 SimChat(Utils.StringToBytes("[NINJA] Too many messages for this joint, suppressing further messages."), 3765 SimChat(Utils.StringToBytes("[NINJA]: Too many messages for this joint, suppressing further messages."),
3766 ChatTypeEnum.DebugChannel, 3766 ChatTypeEnum.DebugChannel,
3767 2147483647, 3767 2147483647,
3768 jointProxyObject.AbsolutePosition, 3768 jointProxyObject.AbsolutePosition,
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index e092334..64b3d67 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
51 [Test] 51 [Test]
52 public void TestSimpleNotNeighboursTeleport() 52 public void TestSimpleNotNeighboursTeleport()
53 { 53 {
54 //log4net.Config.XmlConfigurator.Configure(); 54 log4net.Config.XmlConfigurator.Configure();
55 55
56 UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); 56 UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100");
57 UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200"); 57 UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200");
@@ -80,20 +80,18 @@ namespace OpenSim.Region.Framework.Scenes.Tests
80 80
81 // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used. 81 // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
82 client.TeleportTargetScene = sceneB; 82 client.TeleportTargetScene = sceneB;
83 // Commenting this out for now -- Diva 83 client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
84 //client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
85 84
86 //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB"); 85 Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");
87 //Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA"); 86 Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
88 87
89 //ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>(); 88 ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>();
90 89
91 // Temporary assertion - caps url construction should at least be doable through a method. 90 // Temporary assertion - caps url construction should at least be doable through a method.
92 //Assert.That( 91 Assert.That(
93 // "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 92 "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/",
94 // Is.EqualTo(client.CapsSeedUrl), 93 Is.EqualTo(client.CapsSeedUrl),
95 // "Incorrect caps object path set up in sceneB"); 94 "Incorrect caps object path set up in sceneB");
96 // ---- up to here -- Diva
97 95
98 // This assertion will currently fail since we don't remove the caps paths when no longer needed 96 // This assertion will currently fail since we don't remove the caps paths when no longer needed
99 //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path"); 97 //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");