diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/IInterServiceInventoryServices.cs (renamed from OpenSim/Framework/Communications/IInterGridInventoryServices.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/IInventoryServices.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 6272872..3659d86 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -88,11 +88,11 @@ namespace OpenSim.Framework.Communications | |||
88 | } | 88 | } |
89 | protected AssetCache m_assetCache; | 89 | protected AssetCache m_assetCache; |
90 | 90 | ||
91 | public IInterGridInventoryServices InterGridInventoryService | 91 | public IInterServiceInventoryServices InterServiceInventoryService |
92 | { | 92 | { |
93 | get { return m_interGridInventoryService; } | 93 | get { return m_interServiceInventoryService; } |
94 | } | 94 | } |
95 | protected IInterGridInventoryServices m_interGridInventoryService; | 95 | protected IInterServiceInventoryServices m_interServiceInventoryService; |
96 | 96 | ||
97 | public NetworkServersInfo NetworkServersInfo | 97 | public NetworkServersInfo NetworkServersInfo |
98 | { | 98 | { |
@@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications | |||
296 | } | 296 | } |
297 | else | 297 | else |
298 | { | 298 | { |
299 | InventoryService.CreateNewUserInventory(userProf.ID); | 299 | InterServiceInventoryService.CreateNewUserInventory(userProf.ID); |
300 | m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName); | 300 | m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName); |
301 | return userProf.ID; | 301 | return userProf.ID; |
302 | } | 302 | } |
diff --git a/OpenSim/Framework/Communications/IInterGridInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs index e820c5e..24213f2 100644 --- a/OpenSim/Framework/Communications/IInterGridInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs | |||
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Communications | |||
33 | /// <summary> | 33 | /// <summary> |
34 | /// Inventory operations used between grid services. | 34 | /// Inventory operations used between grid services. |
35 | /// </summary> | 35 | /// </summary> |
36 | public interface IInterGridInventoryServices | 36 | public interface IInterServiceInventoryServices |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// Create a new inventory for the given user. | 39 | /// Create a new inventory for the given user. |
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs index bb16a49..08a2c5f 100644 --- a/OpenSim/Framework/Communications/IInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInventoryServices.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications | |||
40 | /// <summary> | 40 | /// <summary> |
41 | /// Defines all the operations one can perform on a user's inventory. | 41 | /// Defines all the operations one can perform on a user's inventory. |
42 | /// </summary> | 42 | /// </summary> |
43 | public interface IInventoryServices : IInterGridInventoryServices | 43 | public interface IInventoryServices |
44 | { | 44 | { |
45 | string Host | 45 | string Host |
46 | { | 46 | { |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index fd2e6b1..06b707b 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications | |||
38 | /// <summary> | 38 | /// <summary> |
39 | /// Abstract base class used by local and grid implementations of an inventory service. | 39 | /// Abstract base class used by local and grid implementations of an inventory service. |
40 | /// </summary> | 40 | /// </summary> |
41 | public abstract class InventoryServiceBase : IInventoryServices, IInterGridInventoryServices | 41 | public abstract class InventoryServiceBase : IInventoryServices, IInterServiceInventoryServices |
42 | { | 42 | { |
43 | private static readonly ILog m_log | 43 | private static readonly ILog m_log |
44 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |