aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authordiva2009-06-11 03:00:25 +0000
committerdiva2009-06-11 03:00:25 +0000
commit156604e28e51d0a7e0c8018ce10eb517a9123ce4 (patch)
tree5274ef45eb20c76d80c4b1157ee659e3497e5b67 /OpenSim/Grid
parentRemoved a change in StandaloneHypergrid.ini introduced in r9838, which was in... (diff)
downloadopensim-SC-156604e28e51d0a7e0c8018ce10eb517a9123ce4.zip
opensim-SC-156604e28e51d0a7e0c8018ce10eb517a9123ce4.tar.gz
opensim-SC-156604e28e51d0a7e0c8018ce10eb517a9123ce4.tar.bz2
opensim-SC-156604e28e51d0a7e0c8018ce10eb517a9123ce4.tar.xz
InterServiceInventoryService references *almost* completely removed from the simulator. Only a couple left, not important. Also updated the login tests -- Justin, this time I was able to fix this by myself :)
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs2
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
index 30aea14..c4c82e5 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Grid.UserServer.Modules
66 m_config = config; 66 m_config = config;
67 m_defaultHomeX = m_config.DefaultX; 67 m_defaultHomeX = m_config.DefaultX;
68 m_defaultHomeY = m_config.DefaultY; 68 m_defaultHomeY = m_config.DefaultY;
69 m_inventoryService = inventoryService; 69 m_interInventoryService = inventoryService;
70 m_regionProfileService = regionProfileService; 70 m_regionProfileService = regionProfileService;
71 71
72 NetworkServersInfo serversinfo = new NetworkServersInfo(1000, 1000); 72 NetworkServersInfo serversinfo = new NetworkServersInfo(1000, 1000);
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 122ad9d..dff6059 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Grid.UserServer.Modules
74 m_config = config; 74 m_config = config;
75 m_defaultHomeX = m_config.DefaultX; 75 m_defaultHomeX = m_config.DefaultX;
76 m_defaultHomeY = m_config.DefaultY; 76 m_defaultHomeY = m_config.DefaultY;
77 m_inventoryService = inventoryService; 77 m_interInventoryService = inventoryService;
78 m_regionProfileService = regionProfileService; 78 m_regionProfileService = regionProfileService;
79 } 79 }
80 80