diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index 4baa22c..4238bd2 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -131,11 +131,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
131 | { | 131 | { |
132 | TestHelper.InMethod(); | 132 | TestHelper.InMethod(); |
133 | //log4net.Config.XmlConfigurator.Configure(); | 133 | //log4net.Config.XmlConfigurator.Configure(); |
134 | 134 | ||
135 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 135 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
136 | 136 | ||
137 | TestScene scene = SceneSetupHelpers.SetupScene(); | 137 | TestScene scene = SceneSetupHelpers.SetupScene(); |
138 | 138 | ||
139 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 139 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
140 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 140 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
141 | sogd.Enabled = false; | 141 | sogd.Enabled = false; |
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
148 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 148 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
149 | 149 | ||
150 | Assert.That(retrievedPart, Is.Not.Null); | 150 | Assert.That(retrievedPart, Is.Not.Null); |
151 | 151 | ||
152 | sogd.InventoryDeQueueAndDelete(); | 152 | sogd.InventoryDeQueueAndDelete(); |
153 | 153 | ||
154 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); | 154 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 501207e..e39a362 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -104,8 +104,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
104 | agent.AgentID = agent1; | 104 | agent.AgentID = agent1; |
105 | agent.firstname = firstName; | 105 | agent.firstname = firstName; |
106 | agent.lastname = "testlastname"; | 106 | agent.lastname = "testlastname"; |
107 | agent.SessionID = UUID.Zero; | 107 | agent.SessionID = UUID.Random(); |
108 | agent.SecureSessionID = UUID.Zero; | 108 | agent.SecureSessionID = UUID.Random(); |
109 | agent.circuitcode = 123; | 109 | agent.circuitcode = 123; |
110 | agent.BaseFolder = UUID.Zero; | 110 | agent.BaseFolder = UUID.Zero; |
111 | agent.InventoryFolder = UUID.Zero; | 111 | agent.InventoryFolder = UUID.Zero; |
@@ -114,6 +114,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
114 | agent.ChildrenCapSeeds = new Dictionary<ulong, string>(); | 114 | agent.ChildrenCapSeeds = new Dictionary<ulong, string>(); |
115 | agent.child = true; | 115 | agent.child = true; |
116 | 116 | ||
117 | if (scene.PresenceService == null) | ||
118 | Console.WriteLine("Presence Service is null"); | ||
119 | |||
120 | scene.PresenceService.LoginAgent(agent.AgentID.ToString(), agent.SessionID, agent.SecureSessionID); | ||
121 | |||
117 | string reason; | 122 | string reason; |
118 | scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason); | 123 | scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason); |
119 | testclient = new TestClient(agent, scene); | 124 | testclient = new TestClient(agent, scene); |