diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs index d924ecd..b73df2c 100644 --- a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs | |||
@@ -118,13 +118,12 @@ namespace OpenSim.Tests.Common | |||
118 | 118 | ||
119 | public static UserAccount CreateUserWithInventory(Scene scene) | 119 | public static UserAccount CreateUserWithInventory(Scene scene) |
120 | { | 120 | { |
121 | return CreateUserWithInventory(scene, 99); | 121 | return CreateUserWithInventory(scene, TestHelpers.ParseTail(99)); |
122 | } | 122 | } |
123 | 123 | ||
124 | public static UserAccount CreateUserWithInventory(Scene scene, int uuidTail) | 124 | public static UserAccount CreateUserWithInventory(Scene scene, UUID userId) |
125 | { | 125 | { |
126 | return CreateUserWithInventory( | 126 | return CreateUserWithInventory(scene, "Bill", "Bailey", userId, "troll"); |
127 | scene, "Bill", "Bailey", new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail)), "troll"); | ||
128 | } | 127 | } |
129 | 128 | ||
130 | public static UserAccount CreateUserWithInventory( | 129 | public static UserAccount CreateUserWithInventory( |
@@ -139,7 +138,6 @@ namespace OpenSim.Tests.Common | |||
139 | { | 138 | { |
140 | // FIXME: This should really be set up by UserAccount itself | 139 | // FIXME: This should really be set up by UserAccount itself |
141 | ua.ServiceURLs = new Dictionary<string, object>(); | 140 | ua.ServiceURLs = new Dictionary<string, object>(); |
142 | |||
143 | scene.UserAccountService.StoreUserAccount(ua); | 141 | scene.UserAccountService.StoreUserAccount(ua); |
144 | scene.InventoryService.CreateUserInventory(ua.PrincipalID); | 142 | scene.InventoryService.CreateUserInventory(ua.PrincipalID); |
145 | scene.AuthenticationService.SetPassword(ua.PrincipalID, pw); | 143 | scene.AuthenticationService.SetPassword(ua.PrincipalID, pw); |