diff options
Diffstat (limited to '')
3 files changed, 33 insertions, 19 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index b0b35e4..f7003db 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -87,8 +87,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
87 | "Show the bindings between user UUIDs and user names", | 87 | "Show the bindings between user UUIDs and user names", |
88 | String.Empty, | 88 | String.Empty, |
89 | HandleShowUsers); | 89 | HandleShowUsers); |
90 | |||
91 | |||
92 | } | 90 | } |
93 | 91 | ||
94 | public bool IsSharedModule | 92 | public bool IsSharedModule |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index f9e4bb9..d9d7318 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -64,7 +64,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
64 | get | 64 | get |
65 | { | 65 | { |
66 | if (m_UserManagement == null) | 66 | if (m_UserManagement == null) |
67 | { | ||
67 | m_UserManagement = m_Scenes[0].RequestModuleInterface<IUserManagement>(); | 68 | m_UserManagement = m_Scenes[0].RequestModuleInterface<IUserManagement>(); |
69 | |||
70 | if (m_UserManagement == null) | ||
71 | m_log.ErrorFormat( | ||
72 | "[HG INVENTORY CONNECTOR]: Could not retrieve IUserManagement module from {0}", | ||
73 | m_Scenes[0].RegionInfo.RegionName); | ||
74 | } | ||
75 | |||
68 | return m_UserManagement; | 76 | return m_UserManagement; |
69 | } | 77 | } |
70 | } | 78 | } |
@@ -323,7 +331,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
323 | 331 | ||
324 | } | 332 | } |
325 | 333 | ||
326 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | 334 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) |
327 | { | 335 | { |
328 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems " + folderID); | 336 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems " + folderID); |
329 | 337 | ||
@@ -338,7 +346,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
338 | 346 | ||
339 | } | 347 | } |
340 | 348 | ||
341 | public bool AddFolder(InventoryFolderBase folder) | 349 | public bool AddFolder(InventoryFolderBase folder) |
342 | { | 350 | { |
343 | if (folder == null) | 351 | if (folder == null) |
344 | return false; | 352 | return false; |
@@ -355,7 +363,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
355 | return connector.AddFolder(folder); | 363 | return connector.AddFolder(folder); |
356 | } | 364 | } |
357 | 365 | ||
358 | public bool UpdateFolder(InventoryFolderBase folder) | 366 | public bool UpdateFolder(InventoryFolderBase folder) |
359 | { | 367 | { |
360 | if (folder == null) | 368 | if (folder == null) |
361 | return false; | 369 | return false; |
@@ -372,7 +380,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
372 | return connector.UpdateFolder(folder); | 380 | return connector.UpdateFolder(folder); |
373 | } | 381 | } |
374 | 382 | ||
375 | public bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) | 383 | public bool DeleteFolders(UUID ownerID, List<UUID> folderIDs) |
376 | { | 384 | { |
377 | if (folderIDs == null) | 385 | if (folderIDs == null) |
378 | return false; | 386 | return false; |
@@ -391,7 +399,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
391 | return connector.DeleteFolders(ownerID, folderIDs); | 399 | return connector.DeleteFolders(ownerID, folderIDs); |
392 | } | 400 | } |
393 | 401 | ||
394 | public bool MoveFolder(InventoryFolderBase folder) | 402 | public bool MoveFolder(InventoryFolderBase folder) |
395 | { | 403 | { |
396 | if (folder == null) | 404 | if (folder == null) |
397 | return false; | 405 | return false; |
@@ -408,7 +416,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
408 | return connector.MoveFolder(folder); | 416 | return connector.MoveFolder(folder); |
409 | } | 417 | } |
410 | 418 | ||
411 | public bool PurgeFolder(InventoryFolderBase folder) | 419 | public bool PurgeFolder(InventoryFolderBase folder) |
412 | { | 420 | { |
413 | if (folder == null) | 421 | if (folder == null) |
414 | return false; | 422 | return false; |
@@ -442,7 +450,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
442 | return connector.AddItem(item); | 450 | return connector.AddItem(item); |
443 | } | 451 | } |
444 | 452 | ||
445 | public bool UpdateItem(InventoryItemBase item) | 453 | public bool UpdateItem(InventoryItemBase item) |
446 | { | 454 | { |
447 | if (item == null) | 455 | if (item == null) |
448 | return false; | 456 | return false; |
@@ -459,7 +467,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
459 | return connector.UpdateItem(item); | 467 | return connector.UpdateItem(item); |
460 | } | 468 | } |
461 | 469 | ||
462 | public bool MoveItems(UUID ownerID, List<InventoryItemBase> items) | 470 | public bool MoveItems(UUID ownerID, List<InventoryItemBase> items) |
463 | { | 471 | { |
464 | if (items == null) | 472 | if (items == null) |
465 | return false; | 473 | return false; |
@@ -478,7 +486,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
478 | return connector.MoveItems(ownerID, items); | 486 | return connector.MoveItems(ownerID, items); |
479 | } | 487 | } |
480 | 488 | ||
481 | public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) | 489 | public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) |
482 | { | 490 | { |
483 | //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Delete {0} items for user {1}", itemIDs.Count, ownerID); | 491 | //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Delete {0} items for user {1}", itemIDs.Count, ownerID); |
484 | 492 | ||
@@ -497,7 +505,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
497 | return connector.DeleteItems(ownerID, itemIDs); | 505 | return connector.DeleteItems(ownerID, itemIDs); |
498 | } | 506 | } |
499 | 507 | ||
500 | public InventoryItemBase GetItem(InventoryItemBase item) | 508 | public InventoryItemBase GetItem(InventoryItemBase item) |
501 | { | 509 | { |
502 | if (item == null) | 510 | if (item == null) |
503 | return null; | 511 | return null; |
@@ -513,7 +521,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
513 | return connector.GetItem(item); | 521 | return connector.GetItem(item); |
514 | } | 522 | } |
515 | 523 | ||
516 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) | 524 | public InventoryFolderBase GetFolder(InventoryFolderBase folder) |
517 | { | 525 | { |
518 | if (folder == null) | 526 | if (folder == null) |
519 | return null; | 527 | return null; |
@@ -530,17 +538,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
530 | return connector.GetFolder(folder); | 538 | return connector.GetFolder(folder); |
531 | } | 539 | } |
532 | 540 | ||
533 | public bool HasInventoryForUser(UUID userID) | 541 | public bool HasInventoryForUser(UUID userID) |
534 | { | 542 | { |
535 | return false; | 543 | return false; |
536 | } | 544 | } |
537 | 545 | ||
538 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | 546 | public List<InventoryItemBase> GetActiveGestures(UUID userId) |
539 | { | 547 | { |
540 | return new List<InventoryItemBase>(); | 548 | return new List<InventoryItemBase>(); |
541 | } | 549 | } |
542 | 550 | ||
543 | public int GetAssetPermissions(UUID userID, UUID assetID) | 551 | public int GetAssetPermissions(UUID userID, UUID assetID) |
544 | { | 552 | { |
545 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetAssetPermissions " + assetID); | 553 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetAssetPermissions " + assetID); |
546 | 554 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 4a3ccc5..97fdd4e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -57,12 +57,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
57 | if (m_UserManager == null) | 57 | if (m_UserManager == null) |
58 | { | 58 | { |
59 | m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>(); | 59 | m_UserManager = m_Scene.RequestModuleInterface<IUserManagement>(); |
60 | |||
61 | if (m_UserManager == null) | ||
62 | m_log.ErrorFormat( | ||
63 | "[XINVENTORY CONNECTOR]: Could not retrieve IUserManagement module from {0}", | ||
64 | m_Scene.RegionInfo.RegionName); | ||
60 | } | 65 | } |
66 | |||
61 | return m_UserManager; | 67 | return m_UserManager; |
62 | } | 68 | } |
63 | 69 | ||
64 | set | 70 | set |
65 | { | 71 | { |
72 | m_log.WarnFormat( | ||
73 | "[XINVENTORY CONNECTOR]: Manually setting UserManager {0} (scene {1})", value, m_Scene); | ||
74 | |||
66 | m_UserManager = value; | 75 | m_UserManager = value; |
67 | } | 76 | } |
68 | } | 77 | } |
@@ -91,12 +100,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
91 | Init(source); | 100 | Init(source); |
92 | } | 101 | } |
93 | 102 | ||
94 | protected void Init(IConfigSource source) | 103 | protected void Init(IConfigSource source) |
95 | { | 104 | { |
96 | m_RemoteConnector = new XInventoryServicesConnector(source); | 105 | m_RemoteConnector = new XInventoryServicesConnector(source); |
97 | } | 106 | } |
98 | 107 | ||
99 | |||
100 | #region ISharedRegionModule | 108 | #region ISharedRegionModule |
101 | 109 | ||
102 | public void Initialise(IConfigSource source) | 110 | public void Initialise(IConfigSource source) |
@@ -186,7 +194,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
186 | return m_RemoteConnector.GetFolderForType(userID, type); | 194 | return m_RemoteConnector.GetFolderForType(userID, type); |
187 | } | 195 | } |
188 | 196 | ||
189 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 197 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
190 | { | 198 | { |
191 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); | 199 | InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID); |
192 | Util.FireAndForget(delegate | 200 | Util.FireAndForget(delegate |