diff options
author | Justin Clarke Casey | 2009-04-14 18:49:45 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-14 18:49:45 +0000 |
commit | d0744f8eca6adc2b6ae257f581792bd8eae16ea2 (patch) | |
tree | c6fe087005bb4d1a0ccf7ded71b611cec721a817 /OpenSim/Region/CoreModules/Avatar | |
parent | Fix for minor bug introduced yesterday, HG only. Can't lookup the profile whe... (diff) | |
download | opensim-SC_OLD-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.zip opensim-SC_OLD-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.gz opensim-SC_OLD-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.bz2 opensim-SC_OLD-d0744f8eca6adc2b6ae257f581792bd8eae16ea2.tar.xz |
* Make archiver tests pump the asset server manually instead of starting the normal runtime thread
* This may eliminate the occasional archive test freezes, since they appeared to occur when somehow the asset server didn't pick up on the presence of a request in the asset
quque
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index c140ec0..01e5ae0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
67 | 67 | ||
68 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); | 68 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
69 | 69 | ||
70 | Scene scene = SceneSetupHelpers.SetupScene(); | 70 | Scene scene = SceneSetupHelpers.SetupScene(false); |
71 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); | 71 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); |
72 | CommunicationsManager cm = scene.CommsManager; | 72 | CommunicationsManager cm = scene.CommsManager; |
73 | 73 | ||
@@ -119,6 +119,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
119 | lock (this) | 119 | lock (this) |
120 | { | 120 | { |
121 | archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream); | 121 | archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream); |
122 | AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer; | ||
123 | while (assetServer.HasWaitingRequests()) | ||
124 | assetServer.ProcessNextRequest(); | ||
125 | |||
122 | Monitor.Wait(this, 60000); | 126 | Monitor.Wait(this, 60000); |
123 | } | 127 | } |
124 | 128 | ||