diff options
author | Justin Clark-Casey (justincc) | 2013-07-26 19:22:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-26 19:22:30 +0100 |
commit | 056a6ee7653b17d8c1d92519f34f029bcd602143 (patch) | |
tree | ac59eb147365925e4fb4f3d37e9a77aa1f2a8976 /OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |
parent | Fix NPC regression test failures. (diff) | |
download | opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.zip opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.gz opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.bz2 opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.xz |
Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 508743c..4ecae73 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -38,6 +38,8 @@ using NUnit.Framework; | |||
38 | using OpenMetaverse; | 38 | using OpenMetaverse; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Communications; | 40 | using OpenSim.Framework.Communications; |
41 | using OpenSim.Framework.Servers; | ||
42 | using OpenSim.Framework.Servers.HttpServer; | ||
41 | using OpenSim.Region.CoreModules.Avatar.Attachments; | 43 | using OpenSim.Region.CoreModules.Avatar.Attachments; |
42 | using OpenSim.Region.CoreModules.Framework; | 44 | using OpenSim.Region.CoreModules.Framework; |
43 | using OpenSim.Region.CoreModules.Framework.EntityTransfer; | 45 | using OpenSim.Region.CoreModules.Framework.EntityTransfer; |
@@ -802,6 +804,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
802 | TestHelpers.InMethod(); | 804 | TestHelpers.InMethod(); |
803 | // TestHelpers.EnableLogging(); | 805 | // TestHelpers.EnableLogging(); |
804 | 806 | ||
807 | BaseHttpServer httpServer = new BaseHttpServer(99999); | ||
808 | MainServer.AddHttpServer(httpServer); | ||
809 | MainServer.Instance = httpServer; | ||
810 | |||
805 | AttachmentsModule attModA = new AttachmentsModule(); | 811 | AttachmentsModule attModA = new AttachmentsModule(); |
806 | AttachmentsModule attModB = new AttachmentsModule(); | 812 | AttachmentsModule attModB = new AttachmentsModule(); |
807 | EntityTransferModule etmA = new EntityTransferModule(); | 813 | EntityTransferModule etmA = new EntityTransferModule(); |
@@ -830,6 +836,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
830 | SceneHelpers.SetupSceneModules( | 836 | SceneHelpers.SetupSceneModules( |
831 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); | 837 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); |
832 | 838 | ||
839 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour | ||
840 | lscm.ServiceVersion = "SIMULATION/0.1"; | ||
841 | |||
833 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); | 842 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); |
834 | 843 | ||
835 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); | 844 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); |