diff options
author | Justin Clark-Casey (justincc) | 2010-06-04 20:43:05 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-04 20:43:05 +0100 |
commit | 75878c8f43251477b3b10942b689d69c1e803056 (patch) | |
tree | 6baa8fa16d45e8c20768c4eff7dec3bb2c2cebd9 /OpenSim/Region/CoreModules | |
parent | remove estate stuff in sqlite region migrations since this also exists in est... (diff) | |
download | opensim-SC_OLD-75878c8f43251477b3b10942b689d69c1e803056.zip opensim-SC_OLD-75878c8f43251477b3b10942b689d69c1e803056.tar.gz opensim-SC_OLD-75878c8f43251477b3b10942b689d69c1e803056.tar.bz2 opensim-SC_OLD-75878c8f43251477b3b10942b689d69c1e803056.tar.xz |
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
additional tweaks to get this working properly
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 307db97..ab5f485 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -390,7 +390,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
390 | /// <returns></returns> | 390 | /// <returns></returns> |
391 | protected UserAccount GetUserInfo(string firstName, string lastName, string pass) | 391 | protected UserAccount GetUserInfo(string firstName, string lastName, string pass) |
392 | { | 392 | { |
393 | UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName); | 393 | UserAccount account |
394 | = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName); | ||
395 | |||
394 | if (null == account) | 396 | if (null == account) |
395 | { | 397 | { |
396 | m_log.ErrorFormat( | 398 | m_log.ErrorFormat( |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index c81f295..a3b3e2d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
76 | // Commenting for now! The mock inventory service needs more beef, at least for | 76 | // Commenting for now! The mock inventory service needs more beef, at least for |
77 | // GetFolderForType | 77 | // GetFolderForType |
78 | // REFACTORING PROBLEM. This needs to be rewritten. | 78 | // REFACTORING PROBLEM. This needs to be rewritten. |
79 | //[Test] | 79 | [Test] |
80 | public void TestSaveIarV0_1() | 80 | public void TestSaveIarV0_1() |
81 | { | 81 | { |
82 | TestHelper.InMethod(); | 82 | TestHelper.InMethod(); |
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
84 | 84 | ||
85 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); | 85 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); |
86 | 86 | ||
87 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); | 87 | Scene scene = SceneSetupHelpers.SetupScene("Inventory, useraccounts"); |
88 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); | 88 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); |
89 | 89 | ||
90 | // Create user | 90 | // Create user |