diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index a898992..71b3062 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -34,7 +34,7 @@ using Nini.Config; | |||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
37 | using OpenSim.Framework.Communications.Cache; | 37 | |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
113 | /// Trigger the inventory archive saved event. | 113 | /// Trigger the inventory archive saved event. |
114 | /// </summary> | 114 | /// </summary> |
115 | protected internal void TriggerInventoryArchiveSaved( | 115 | protected internal void TriggerInventoryArchiveSaved( |
116 | Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, | 116 | Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, |
117 | Exception reportedException) | 117 | Exception reportedException) |
118 | { | 118 | { |
119 | InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; | 119 | InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; |
@@ -125,11 +125,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
125 | { | 125 | { |
126 | if (m_scenes.Count > 0) | 126 | if (m_scenes.Count > 0) |
127 | { | 127 | { |
128 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); | 128 | UserAccount userInfo = GetUserInfo(firstName, lastName, pass); |
129 | 129 | ||
130 | if (userInfo != null) | 130 | if (userInfo != null) |
131 | { | 131 | { |
132 | if (CheckPresence(userInfo.UserProfile.ID)) | 132 | if (CheckPresence(userInfo.PrincipalID)) |
133 | { | 133 | { |
134 | try | 134 | try |
135 | { | 135 | { |
@@ -150,8 +150,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
150 | else | 150 | else |
151 | { | 151 | { |
152 | m_log.ErrorFormat( | 152 | m_log.ErrorFormat( |
153 | "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", | 153 | "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator", |
154 | userInfo.UserProfile.Name, userInfo.UserProfile.ID); | 154 | userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID); |
155 | } | 155 | } |
156 | } | 156 | } |
157 | } | 157 | } |
@@ -163,11 +163,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
163 | { | 163 | { |
164 | if (m_scenes.Count > 0) | 164 | if (m_scenes.Count > 0) |
165 | { | 165 | { |
166 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); | 166 | UserAccount userInfo = GetUserInfo(firstName, lastName, pass); |
167 | 167 | ||
168 | if (userInfo != null) | 168 | if (userInfo != null) |
169 | { | 169 | { |
170 | if (CheckPresence(userInfo.UserProfile.ID)) | 170 | if (CheckPresence(userInfo.PrincipalID)) |
171 | { | 171 | { |
172 | try | 172 | try |
173 | { | 173 | { |
@@ -188,8 +188,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
188 | else | 188 | else |
189 | { | 189 | { |
190 | m_log.ErrorFormat( | 190 | m_log.ErrorFormat( |
191 | "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", | 191 | "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator", |
192 | userInfo.UserProfile.Name, userInfo.UserProfile.ID); | 192 | userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID); |
193 | } | 193 | } |
194 | } | 194 | } |
195 | } | 195 | } |
@@ -201,11 +201,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
201 | { | 201 | { |
202 | if (m_scenes.Count > 0) | 202 | if (m_scenes.Count > 0) |
203 | { | 203 | { |
204 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); | 204 | UserAccount userInfo = GetUserInfo(firstName, lastName, pass); |
205 | 205 | ||
206 | if (userInfo != null) | 206 | if (userInfo != null) |
207 | { | 207 | { |
208 | if (CheckPresence(userInfo.UserProfile.ID)) | 208 | if (CheckPresence(userInfo.PrincipalID)) |
209 | { | 209 | { |
210 | InventoryArchiveReadRequest request; | 210 | InventoryArchiveReadRequest request; |
211 | 211 | ||
@@ -230,8 +230,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
230 | else | 230 | else |
231 | { | 231 | { |
232 | m_log.ErrorFormat( | 232 | m_log.ErrorFormat( |
233 | "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", | 233 | "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator", |
234 | userInfo.UserProfile.Name, userInfo.UserProfile.ID); | 234 | userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID); |
235 | } | 235 | } |
236 | } | 236 | } |
237 | } | 237 | } |
@@ -243,11 +243,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
243 | { | 243 | { |
244 | if (m_scenes.Count > 0) | 244 | if (m_scenes.Count > 0) |
245 | { | 245 | { |
246 | CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); | 246 | UserAccount userInfo = GetUserInfo(firstName, lastName, pass); |
247 | 247 | ||
248 | if (userInfo != null) | 248 | if (userInfo != null) |
249 | { | 249 | { |
250 | if (CheckPresence(userInfo.UserProfile.ID)) | 250 | if (CheckPresence(userInfo.PrincipalID)) |
251 | { | 251 | { |
252 | InventoryArchiveReadRequest request; | 252 | InventoryArchiveReadRequest request; |
253 | 253 | ||
@@ -272,8 +272,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
272 | else | 272 | else |
273 | { | 273 | { |
274 | m_log.ErrorFormat( | 274 | m_log.ErrorFormat( |
275 | "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", | 275 | "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator", |
276 | userInfo.UserProfile.Name, userInfo.UserProfile.ID); | 276 | userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | } | 279 | } |
@@ -345,7 +345,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
345 | } | 345 | } |
346 | 346 | ||
347 | private void SaveInvConsoleCommandCompleted( | 347 | private void SaveInvConsoleCommandCompleted( |
348 | Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, | 348 | Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, |
349 | Exception reportedException) | 349 | Exception reportedException) |
350 | { | 350 | { |
351 | lock (m_pendingConsoleSaves) | 351 | lock (m_pendingConsoleSaves) |
@@ -358,13 +358,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
358 | 358 | ||
359 | if (succeeded) | 359 | if (succeeded) |
360 | { | 360 | { |
361 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0}", userInfo.UserProfile.Name); | 361 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0} {1}", userInfo.FirstName, userInfo.LastName); |
362 | } | 362 | } |
363 | else | 363 | else |
364 | { | 364 | { |
365 | m_log.ErrorFormat( | 365 | m_log.ErrorFormat( |
366 | "[INVENTORY ARCHIVER]: Archive save for {0} failed - {1}", | 366 | "[INVENTORY ARCHIVER]: Archive save for {0} {1} failed - {2}", |
367 | userInfo.UserProfile.Name, reportedException.Message); | 367 | userInfo.FirstName, userInfo.LastName, reportedException.Message); |
368 | } | 368 | } |
369 | } | 369 | } |
370 | 370 | ||
@@ -375,11 +375,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
375 | /// <param name="lastName"></param> | 375 | /// <param name="lastName"></param> |
376 | /// <param name="pass">User password</param> | 376 | /// <param name="pass">User password</param> |
377 | /// <returns></returns> | 377 | /// <returns></returns> |
378 | protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass) | 378 | protected UserAccount GetUserInfo(string firstName, string lastName, string pass) |
379 | { | 379 | { |
380 | CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); | 380 | UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName); |
381 | //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName); | 381 | if (null == account) |
382 | if (null == userInfo) | ||
383 | { | 382 | { |
384 | m_log.ErrorFormat( | 383 | m_log.ErrorFormat( |
385 | "[INVENTORY ARCHIVER]: Failed to find user info for {0} {1}", | 384 | "[INVENTORY ARCHIVER]: Failed to find user info for {0} {1}", |
@@ -389,9 +388,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
389 | 388 | ||
390 | try | 389 | try |
391 | { | 390 | { |
392 | if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass)) | 391 | if (m_aScene.AuthenticationService.Authenticate(account.PrincipalID, pass, 1) != string.Empty) |
393 | { | 392 | { |
394 | return userInfo; | 393 | return account; |
395 | } | 394 | } |
396 | else | 395 | else |
397 | { | 396 | { |
@@ -412,14 +411,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
412 | /// Notify the client of loaded nodes if they are logged in | 411 | /// Notify the client of loaded nodes if they are logged in |
413 | /// </summary> | 412 | /// </summary> |
414 | /// <param name="loadedNodes">Can be empty. In which case, nothing happens</param> | 413 | /// <param name="loadedNodes">Can be empty. In which case, nothing happens</param> |
415 | private void UpdateClientWithLoadedNodes(CachedUserInfo userInfo, List<InventoryNodeBase> loadedNodes) | 414 | private void UpdateClientWithLoadedNodes(UserAccount userInfo, List<InventoryNodeBase> loadedNodes) |
416 | { | 415 | { |
417 | if (loadedNodes.Count == 0) | 416 | if (loadedNodes.Count == 0) |
418 | return; | 417 | return; |
419 | 418 | ||
420 | foreach (Scene scene in m_scenes.Values) | 419 | foreach (Scene scene in m_scenes.Values) |
421 | { | 420 | { |
422 | ScenePresence user = scene.GetScenePresence(userInfo.UserProfile.ID); | 421 | ScenePresence user = scene.GetScenePresence(userInfo.PrincipalID); |
423 | 422 | ||
424 | if (user != null && !user.IsChildAgent) | 423 | if (user != null && !user.IsChildAgent) |
425 | { | 424 | { |