diff options
Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs index 26156f3..d01521d 100644 --- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs +++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Tests.Common.Setup | |||
53 | // UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099"); | 53 | // UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099"); |
54 | // return CreateUserWithInventory(commsManager, userId, callback); | 54 | // return CreateUserWithInventory(commsManager, userId, callback); |
55 | // } | 55 | // } |
56 | // | 56 | // |
57 | // /// <summary> | 57 | // /// <summary> |
58 | // /// Create a test user with a standard inventory | 58 | // /// Create a test user with a standard inventory |
59 | // /// </summary> | 59 | // /// </summary> |
@@ -108,11 +108,11 @@ namespace OpenSim.Tests.Common.Setup | |||
108 | // { | 108 | // { |
109 | // LocalUserServices lus = (LocalUserServices)commsManager.UserService; | 109 | // LocalUserServices lus = (LocalUserServices)commsManager.UserService; |
110 | // lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId); | 110 | // lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId); |
111 | // | 111 | // |
112 | // CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); | 112 | // CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); |
113 | // userInfo.OnInventoryReceived += callback; | 113 | // userInfo.OnInventoryReceived += callback; |
114 | // userInfo.FetchInventory(); | 114 | // userInfo.FetchInventory(); |
115 | // | 115 | // |
116 | // return userInfo; | 116 | // return userInfo; |
117 | // } | 117 | // } |
118 | 118 | ||
@@ -140,6 +140,6 @@ namespace OpenSim.Tests.Common.Setup | |||
140 | scene.UserAccountService.StoreUserAccount(ua); | 140 | scene.UserAccountService.StoreUserAccount(ua); |
141 | scene.InventoryService.CreateUserInventory(ua.PrincipalID); | 141 | scene.InventoryService.CreateUserInventory(ua.PrincipalID); |
142 | scene.AuthenticationService.SetPassword(ua.PrincipalID, pw); | 142 | scene.AuthenticationService.SetPassword(ua.PrincipalID, pw); |
143 | } | 143 | } |
144 | } | 144 | } |
145 | } \ No newline at end of file | 145 | } \ No newline at end of file |