diff options
| author | Melanie | 2011-05-22 20:23:25 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-22 20:23:25 +0100 |
| commit | be1996f1210ba58ba44f9715de68a3675cf13582 (patch) | |
| tree | 7306bfe8a6e89bd1b2de9f145bea85f2b5645164 /OpenSim/Region/CoreModules/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Add stubs for unimplemented lsl functions (diff) | |
| download | opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.zip opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.gz opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.bz2 opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs index 8d53cf1..733ad25 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | |||
| @@ -45,7 +45,6 @@ using OpenSim.Region.Framework.Scenes.Serialization; | |||
| 45 | using OpenSim.Services.Interfaces; | 45 | using OpenSim.Services.Interfaces; |
| 46 | using OpenSim.Tests.Common; | 46 | using OpenSim.Tests.Common; |
| 47 | using OpenSim.Tests.Common.Mock; | 47 | using OpenSim.Tests.Common.Mock; |
| 48 | using OpenSim.Tests.Common.Setup; | ||
| 49 | 48 | ||
| 50 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | 49 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests |
| 51 | { | 50 | { |
| @@ -73,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests | |||
| 73 | string userFirstName = "Jock"; | 72 | string userFirstName = "Jock"; |
| 74 | string userLastName = "Stirrup"; | 73 | string userLastName = "Stirrup"; |
| 75 | string userPassword = "troll"; | 74 | string userPassword = "troll"; |
| 76 | UserProfileTestUtils.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword); | 75 | UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword); |
| 77 | 76 | ||
| 78 | AgentCircuitData acd = new AgentCircuitData(); | 77 | AgentCircuitData acd = new AgentCircuitData(); |
| 79 | acd.AgentID = m_userId; | 78 | acd.AgentID = m_userId; |