aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs8
-rw-r--r--OpenSim/Framework/Communications/IInterServiceInventoryServices.cs (renamed from OpenSim/Framework/Communications/IInterGridInventoryServices.cs)2
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs6
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs8
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs2
10 files changed, 21 insertions, 21 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);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 30a41f4..4b4292d 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Grid.UserServer
54 public UserManager m_userManager; 54 public UserManager m_userManager;
55 public UserLoginService m_loginService; 55 public UserLoginService m_loginService;
56 public MessageServersConnector m_messagesService; 56 public MessageServersConnector m_messagesService;
57 protected IInventoryServices m_inventoryService; 57 protected IInterServiceInventoryServices m_interServiceInventoryService;
58 58
59 private LLUUID m_lastCreatedUser = LLUUID.Random(); 59 private LLUUID m_lastCreatedUser = LLUUID.Random();
60 60
@@ -103,7 +103,7 @@ namespace OpenSim.Grid.UserServer
103 m_loginService = new UserLoginService( 103 m_loginService = new UserLoginService(
104 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); 104 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
105 105
106 m_inventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl); 106 m_interServiceInventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl);
107 107
108 m_messagesService = new MessageServersConnector(); 108 m_messagesService = new MessageServersConnector();
109 109
@@ -196,7 +196,7 @@ namespace OpenSim.Grid.UserServer
196 196
197 try 197 try
198 { 198 {
199 if (!m_inventoryService.CreateNewUserInventory(userID)) 199 if (!m_interServiceInventoryService.CreateNewUserInventory(userID))
200 { 200 {
201 throw new Exception( 201 throw new Exception(
202 String.Format( 202 String.Format(
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 3bc3f9a..6793889 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Communications.Local
46 { 46 {
47 AddInventoryService(inventoryService); 47 AddInventoryService(inventoryService);
48 m_defaultInventoryHost = inventoryService.Host; 48 m_defaultInventoryHost = inventoryService.Host;
49 m_interGridInventoryService = inventoryService; 49 m_interServiceInventoryService = inventoryService;
50 m_userService = userService; 50 m_userService = userService;
51 m_avatarService = (IAvatarService)userService; 51 m_avatarService = (IAvatarService)userService;
52 m_gridService = gridService; 52 m_gridService = gridService;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 98672c2..bdd32ea 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local
85 profile = m_userManager.GetUserProfile(firstname, lastname); 85 profile = m_userManager.GetUserProfile(firstname, lastname);
86 if (profile != null) 86 if (profile != null)
87 { 87 {
88 m_Parent.InterGridInventoryService.CreateNewUserInventory(profile.ID); 88 m_Parent.InterServiceInventoryService.CreateNewUserInventory(profile.ID);
89 } 89 }
90 90
91 return profile; 91 return profile;
@@ -260,13 +260,13 @@ namespace OpenSim.Region.Communications.Local
260 // See LoginService 260 // See LoginService
261 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) 261 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
262 { 262 {
263 List<InventoryFolderBase> folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID); 263 List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
264 264
265 // If we have user auth but no inventory folders for some reason, create a new set of folders. 265 // If we have user auth but no inventory folders for some reason, create a new set of folders.
266 if (null == folders || 0 == folders.Count) 266 if (null == folders || 0 == folders.Count)
267 { 267 {
268 m_Parent.InterGridInventoryService.CreateNewUserInventory(userID); 268 m_Parent.InterServiceInventoryService.CreateNewUserInventory(userID);
269 folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID); 269 folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
270 } 270 }
271 271
272 LLUUID rootID = LLUUID.Zero; 272 LLUUID rootID = LLUUID.Zero;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 76791f1..2ee7981 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local
37 // private readonly NetworkServersInfo m_serversInfo; 37 // private readonly NetworkServersInfo m_serversInfo;
38 private readonly uint m_defaultHomeX; 38 private readonly uint m_defaultHomeX;
39 private readonly uint m_defaultHomeY; 39 private readonly uint m_defaultHomeY;
40 private IInterGridInventoryServices m_interGridInventoryService; 40 private IInterServiceInventoryServices m_interServiceInventoryService;
41 41
42 /// <summary> 42 /// <summary>
43 /// 43 ///
@@ -48,14 +48,14 @@ namespace OpenSim.Region.Communications.Local
48 /// <param name="inventoryService"></param> 48 /// <param name="inventoryService"></param>
49 /// <param name="statsCollector">Can be null if stats collection is not required.</param> 49 /// <param name="statsCollector">Can be null if stats collection is not required.</param>
50 public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, 50 public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
51 IInterGridInventoryServices interGridInventoryService) 51 IInterServiceInventoryServices interServiceInventoryService)
52 { 52 {
53 // m_serversInfo = serversInfo; 53 // m_serversInfo = serversInfo;
54 54
55 m_defaultHomeX = defaultHomeLocX; 55 m_defaultHomeX = defaultHomeLocX;
56 m_defaultHomeY = defaultHomeLocY; 56 m_defaultHomeY = defaultHomeLocY;
57 57
58 m_interGridInventoryService = interGridInventoryService; 58 m_interServiceInventoryService = interServiceInventoryService;
59 } 59 }
60 60
61 public override UserProfileData SetupMasterUser(string firstName, string lastName) 61 public override UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Communications.Local
82 } 82 }
83 else 83 else
84 { 84 {
85 m_interGridInventoryService.CreateNewUserInventory(profile.ID); 85 m_interServiceInventoryService.CreateNewUserInventory(profile.ID);
86 } 86 }
87 87
88 return profile; 88 return profile;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index b86d9ea..80c286e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
39 39
40namespace OpenSim.Region.Communications.OGS1 40namespace OpenSim.Region.Communications.OGS1
41{ 41{
42 public class OGS1InventoryService : IInventoryServices, IInterGridInventoryServices 42 public class OGS1InventoryService : IInventoryServices, IInterServiceInventoryServices
43 { 43 {
44 private static readonly ILog m_log 44 private static readonly ILog m_log
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
index fbfc680..bb94c20 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
39 39
40namespace OpenSim.Region.Communications.OGS1 40namespace OpenSim.Region.Communications.OGS1
41{ 41{
42 public class OGS1SecureInventoryService : ISecureInventoryService, IInterGridInventoryServices 42 public class OGS1SecureInventoryService : ISecureInventoryService, IInterServiceInventoryServices
43 { 43 {
44 private static readonly ILog m_log 44 private static readonly ILog m_log
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);