Remove a load-order dependency in inventory transfer that was biting

Windows users
arthursv
Melanie 2009-08-20 21:05:00 +01:00
parent 4c8bcd2ff6
commit 297393f349
1 changed files with 6 additions and 7 deletions

View File

@ -67,13 +67,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
if (!m_Scenelist.Contains(scene)) if (!m_Scenelist.Contains(scene))
{ {
if (m_Scenelist.Count == 0)
{
m_TransferModule = scene.RequestModuleInterface<IMessageTransferModule>();
if (m_TransferModule == null)
m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only");
}
m_Scenelist.Add(scene); m_Scenelist.Add(scene);
scene.RegisterModuleInterface<IInventoryTransferModule>(this); scene.RegisterModuleInterface<IInventoryTransferModule>(this);
@ -86,6 +79,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
public void PostInitialise() public void PostInitialise()
{ {
if (m_Scenelist.Count > 0)
{
m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
if (m_TransferModule == null)
m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only");
}
} }
public void Close() public void Close()