diff options
-rw-r--r-- | OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IInventoryModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs (renamed from OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs b/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs index 50f4af3..10fbd58 100644 --- a/OpenSim/Region/Environment/Interfaces/IInventoryModule.cs +++ b/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs | |||
@@ -35,7 +35,7 @@ namespace OpenSim.Framework | |||
35 | /// <summary> | 35 | /// <summary> |
36 | /// An interface for accessing and managing agent inventory | 36 | /// An interface for accessing and managing agent inventory |
37 | /// </summary> | 37 | /// </summary> |
38 | public interface IInventoryModule | 38 | public interface IInventoryTransferModule |
39 | { | 39 | { |
40 | void SetRootAgentScene(UUID agentID, Scene scene); | 40 | void SetRootAgentScene(UUID agentID, Scene scene); |
41 | bool NeedSceneCacheClear(UUID agentID, Scene scene); | 41 | bool NeedSceneCacheClear(UUID agentID, Scene scene); |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 6cc938d..ed58338 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Region.Environment.Scenes; | |||
36 | 36 | ||
37 | namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | 37 | namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer |
38 | { | 38 | { |
39 | public class InventoryModule : IInventoryModule, IRegionModule | 39 | public class InventoryTransferModule : IInventoryTransferModule, IRegionModule |
40 | { | 40 | { |
41 | private static readonly ILog m_log | 41 | private static readonly ILog m_log |
42 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer | |||
59 | { | 59 | { |
60 | m_Scenelist.Add(scene); | 60 | m_Scenelist.Add(scene); |
61 | 61 | ||
62 | scene.RegisterModuleInterface<IInventoryModule>(this); | 62 | scene.RegisterModuleInterface<IInventoryTransferModule>(this); |
63 | 63 | ||
64 | scene.EventManager.OnNewClient += OnNewClient; | 64 | scene.EventManager.OnNewClient += OnNewClient; |
65 | scene.EventManager.OnClientClosed += ClientLoggedOut; | 65 | scene.EventManager.OnClientClosed += ClientLoggedOut; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ceec7bc..42e9c02 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -4022,7 +4022,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
4022 | 4022 | ||
4023 | public void SetRootAgentScene(UUID agentID) | 4023 | public void SetRootAgentScene(UUID agentID) |
4024 | { | 4024 | { |
4025 | IInventoryModule inv = RequestModuleInterface<IInventoryModule>(); | 4025 | IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>(); |
4026 | if (inv == null) | 4026 | if (inv == null) |
4027 | return; | 4027 | return; |
4028 | 4028 | ||
@@ -4031,7 +4031,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
4031 | 4031 | ||
4032 | public bool NeedSceneCacheClear(UUID agentID) | 4032 | public bool NeedSceneCacheClear(UUID agentID) |
4033 | { | 4033 | { |
4034 | IInventoryModule inv = RequestModuleInterface<IInventoryModule>(); | 4034 | IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>(); |
4035 | if (inv == null) | 4035 | if (inv == null) |
4036 | return true; | 4036 | return true; |
4037 | 4037 | ||