diff options
author | Diva Canto | 2010-08-20 11:09:02 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-20 11:09:02 -0700 |
commit | f347d25675dbe84345d4b1bfbad041303c75e293 (patch) | |
tree | 64d5daddd0916b1480620a74da5fe27d9baccd4e /OpenSim/Region | |
parent | Cleaned up a few more things related to incoming agents. (diff) | |
download | opensim-SC_OLD-f347d25675dbe84345d4b1bfbad041303c75e293.zip opensim-SC_OLD-f347d25675dbe84345d4b1bfbad041303c75e293.tar.gz opensim-SC_OLD-f347d25675dbe84345d4b1bfbad041303c75e293.tar.bz2 opensim-SC_OLD-f347d25675dbe84345d4b1bfbad041303c75e293.tar.xz |
Unit test breakage fix.
Diffstat (limited to 'OpenSim/Region')
3 files changed, 14 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index a6f5d97..c023a6f 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -109,9 +109,9 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
109 | Caps caps | 109 | Caps caps |
110 | = new Caps(m_scene, | 110 | = new Caps(m_scene, |
111 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, | 111 | m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
112 | MainServer.Instance.Port, | 112 | (MainServer.Instance == null) ? 0: MainServer.Instance.Port, |
113 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); | 113 | capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); |
114 | 114 | ||
115 | caps.RegisterHandlers(); | 115 | caps.RegisterHandlers(); |
116 | 116 | ||
117 | m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); | 117 | m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); |
@@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
121 | caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset; | 121 | caps.TaskScriptUpdatedCall = m_scene.CapsUpdateTaskInventoryScriptAsset; |
122 | caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS; | 122 | caps.CAPSFetchInventoryDescendents = m_scene.HandleFetchInventoryDescendentsCAPS; |
123 | caps.GetClient = m_scene.SceneContents.GetControllingClient; | 123 | caps.GetClient = m_scene.SceneContents.GetControllingClient; |
124 | 124 | ||
125 | m_capsHandlers[agentId] = caps; | 125 | m_capsHandlers[agentId] = caps; |
126 | } | 126 | } |
127 | 127 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index d4f9f18..54b3260 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -130,11 +130,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
130 | { | 130 | { |
131 | TestHelper.InMethod(); | 131 | TestHelper.InMethod(); |
132 | //log4net.Config.XmlConfigurator.Configure(); | 132 | //log4net.Config.XmlConfigurator.Configure(); |
133 | 133 | ||
134 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 134 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
135 | 135 | ||
136 | TestScene scene = SceneSetupHelpers.SetupScene(); | 136 | TestScene scene = SceneSetupHelpers.SetupScene(); |
137 | 137 | ||
138 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 138 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
139 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 139 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
140 | sogd.Enabled = false; | 140 | sogd.Enabled = false; |
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
147 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 147 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
148 | 148 | ||
149 | Assert.That(retrievedPart, Is.Not.Null); | 149 | Assert.That(retrievedPart, Is.Not.Null); |
150 | 150 | ||
151 | sogd.InventoryDeQueueAndDelete(); | 151 | sogd.InventoryDeQueueAndDelete(); |
152 | 152 | ||
153 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId); | 153 | 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); |