diff options
author | Justin Clark-Casey (justincc) | 2011-07-09 02:25:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-09 02:25:40 +0100 |
commit | 59aedbc94b345a964fc404c22247afd0487b6f54 (patch) | |
tree | 91677f3460784343e2b9cf571214a1a2598e380f /OpenSim | |
parent | Add scratch AvatarFactoryModuleTests with one test to do a partial check on A... (diff) | |
download | opensim-SC-59aedbc94b345a964fc404c22247afd0487b6f54.zip opensim-SC-59aedbc94b345a964fc404c22247afd0487b6f54.tar.gz opensim-SC-59aedbc94b345a964fc404c22247afd0487b6f54.tar.bz2 opensim-SC-59aedbc94b345a964fc404c22247afd0487b6f54.tar.xz |
Rename SceneSetupHelpers.AddRootAgent to AddClient() to better represent its effects and return object
Diffstat (limited to 'OpenSim')
8 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs index cf4c331..736dd72 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
55 | 55 | ||
56 | AgentCircuitData acd = new AgentCircuitData(); | 56 | AgentCircuitData acd = new AgentCircuitData(); |
57 | acd.AgentID = userId; | 57 | acd.AgentID = userId; |
58 | TestClient tc = SceneSetupHelpers.AddRootAgent(scene, acd); | 58 | TestClient tc = SceneSetupHelpers.AddClient(scene, acd); |
59 | 59 | ||
60 | byte[] visualParams = new byte[AvatarAppearance.VISUALPARAM_COUNT]; | 60 | byte[] visualParams = new byte[AvatarAppearance.VISUALPARAM_COUNT]; |
61 | for (byte i = 0; i < visualParams.Length; i++) | 61 | for (byte i = 0; i < visualParams.Length; i++) |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs index cff649b..5586c65 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
83 | region1 = scene.RegionInfo.RegionHandle; | 83 | region1 = scene.RegionInfo.RegionHandle; |
84 | region2 = scene2.RegionInfo.RegionHandle; | 84 | region2 = scene2.RegionInfo.RegionHandle; |
85 | 85 | ||
86 | SceneSetupHelpers.AddRootAgent(scene, agent1); | 86 | SceneSetupHelpers.AddClient(scene, agent1); |
87 | } | 87 | } |
88 | 88 | ||
89 | [Test] | 89 | [Test] |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index 0a82c4f..260d1c0 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
139 | 139 | ||
140 | SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); | 140 | SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); |
141 | 141 | ||
142 | IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId); | 142 | IClientAPI client = SceneSetupHelpers.AddClient(scene, agentId); |
143 | scene.DeRezObjects(client, new System.Collections.Generic.List<uint>() { part.LocalId }, UUID.Zero, DeRezAction.Delete, UUID.Zero); | 143 | scene.DeRezObjects(client, new System.Collections.Generic.List<uint>() { part.LocalId }, UUID.Zero, DeRezAction.Delete, UUID.Zero); |
144 | 144 | ||
145 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 145 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index 5357a06..1b8c100 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
66 | IConfig config = configSource.AddConfig("Startup"); | 66 | IConfig config = configSource.AddConfig("Startup"); |
67 | config.Set("serverside_object_permissions", true); | 67 | config.Set("serverside_object_permissions", true); |
68 | SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); | 68 | SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); |
69 | TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId); | 69 | TestClient client = SceneSetupHelpers.AddClient(scene, userId); |
70 | 70 | ||
71 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 71 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
72 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 72 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
105 | IConfig config = configSource.AddConfig("Startup"); | 105 | IConfig config = configSource.AddConfig("Startup"); |
106 | config.Set("serverside_object_permissions", true); | 106 | config.Set("serverside_object_permissions", true); |
107 | SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); | 107 | SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() }); |
108 | TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId); | 108 | TestClient client = SceneSetupHelpers.AddClient(scene, userId); |
109 | 109 | ||
110 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 110 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
111 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 111 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs index 77bd4c2..8425d37 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
75 | new GroupsModule(), | 75 | new GroupsModule(), |
76 | new MockGroupsServicesConnector() }); | 76 | new MockGroupsServicesConnector() }); |
77 | 77 | ||
78 | TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId); | 78 | TestClient client = SceneSetupHelpers.AddClient(scene, userId); |
79 | 79 | ||
80 | IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>(); | 80 | IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>(); |
81 | 81 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 03ac252..a37b338 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
212 | 212 | ||
213 | SceneSetupHelpers.SetupSceneModules(myScene1, configSource, etm); | 213 | SceneSetupHelpers.SetupSceneModules(myScene1, configSource, etm); |
214 | 214 | ||
215 | SceneSetupHelpers.AddRootAgent(myScene1, agent1Id); | 215 | SceneSetupHelpers.AddClient(myScene1, agent1Id); |
216 | ScenePresence childPresence = myScene2.GetScenePresence(agent1); | 216 | ScenePresence childPresence = myScene2.GetScenePresence(agent1); |
217 | 217 | ||
218 | // TODO: Need to do a fair amount of work to allow synchronous establishment of child agents | 218 | // TODO: Need to do a fair amount of work to allow synchronous establishment of child agents |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index 1b5a54e..4074f5d 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |||
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
125 | sceneA.RegisterRegionWithGrid(); | 125 | sceneA.RegisterRegionWithGrid(); |
126 | 126 | ||
127 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041"); | 127 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041"); |
128 | TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId); | 128 | TestClient client = SceneSetupHelpers.AddClient(sceneA, agentId); |
129 | 129 | ||
130 | ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>(); | 130 | ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>(); |
131 | 131 | ||
diff --git a/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs index bef0481..70621d5 100644 --- a/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs | |||
@@ -341,9 +341,9 @@ namespace OpenSim.Tests.Common | |||
341 | /// <param name="scene"></param> | 341 | /// <param name="scene"></param> |
342 | /// <param name="agentId"></param> | 342 | /// <param name="agentId"></param> |
343 | /// <returns></returns> | 343 | /// <returns></returns> |
344 | public static TestClient AddRootAgent(Scene scene, UUID agentId) | 344 | public static TestClient AddClient(Scene scene, UUID agentId) |
345 | { | 345 | { |
346 | return AddRootAgent(scene, GenerateAgentData(agentId)); | 346 | return AddClient(scene, GenerateAgentData(agentId)); |
347 | } | 347 | } |
348 | 348 | ||
349 | /// <summary> | 349 | /// <summary> |
@@ -364,7 +364,7 @@ namespace OpenSim.Tests.Common | |||
364 | /// <param name="scene"></param> | 364 | /// <param name="scene"></param> |
365 | /// <param name="agentData"></param> | 365 | /// <param name="agentData"></param> |
366 | /// <returns></returns> | 366 | /// <returns></returns> |
367 | public static TestClient AddRootAgent(Scene scene, AgentCircuitData agentData) | 367 | public static TestClient AddClient(Scene scene, AgentCircuitData agentData) |
368 | { | 368 | { |
369 | string reason; | 369 | string reason; |
370 | 370 | ||