aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-24 15:20:57 +0000
committerJustin Clarke Casey2008-07-24 15:20:57 +0000
commit29e8fcd13c99606813c916c4d464372572af230f (patch)
treee20c74b2f02d4c40e1d74c814715e2500cb116f9 /OpenSim/Region/Communications/Local
parentUpdate svn properties. Minor formatting cleanup. (diff)
downloadopensim-SC_OLD-29e8fcd13c99606813c916c4d464372572af230f.zip
opensim-SC_OLD-29e8fcd13c99606813c916c4d464372572af230f.tar.gz
opensim-SC_OLD-29e8fcd13c99606813c916c4d464372572af230f.tar.bz2
opensim-SC_OLD-29e8fcd13c99606813c916c4d464372572af230f.tar.xz
* minor: Rename IInterGridInventoryServices since it's inter service rather than inter grid
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-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
3 files changed, 9 insertions, 9 deletions
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;