diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index a9b4a4f..6d9cedb 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -99,12 +99,11 @@ namespace OpenSim.Grid.UserServer | |||
99 | 99 | ||
100 | m_log.Info("[REGION]: Establishing data connection"); | 100 | m_log.Info("[REGION]: Establishing data connection"); |
101 | m_userManager = new UserManager(); | 101 | m_userManager = new UserManager(); |
102 | m_userManager._config = Cfg; | ||
103 | m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); | 102 | m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); |
104 | 103 | ||
105 | m_gridInfoService = new GridInfoService(); | 104 | m_gridInfoService = new GridInfoService(); |
106 | 105 | ||
107 | m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl); | 106 | m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); |
108 | 107 | ||
109 | m_loginService = new UserLoginService( | 108 | m_loginService = new UserLoginService( |
110 | m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); | 109 | m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); |
@@ -216,7 +215,7 @@ namespace OpenSim.Grid.UserServer | |||
216 | { | 215 | { |
217 | m_log.ErrorFormat( | 216 | m_log.ErrorFormat( |
218 | "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", | 217 | "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", |
219 | m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID); | 218 | Cfg.InventoryUrl + "CreateInventory/", userID.UUID); |
220 | } | 219 | } |
221 | catch (Exception e) | 220 | catch (Exception e) |
222 | { | 221 | { |
@@ -247,13 +246,10 @@ namespace OpenSim.Grid.UserServer | |||
247 | // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); | 246 | // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); |
248 | // requester.ReturnResponseVal = TestResponse; | 247 | // requester.ReturnResponseVal = TestResponse; |
249 | // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); | 248 | // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); |
250 | SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>("POST", | 249 | SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>( |
251 | m_userManager. | 250 | "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); |
252 | _config. | 251 | break; |
253 | InventoryUrl + | 252 | |
254 | "RootFolders/", | ||
255 | m_lastCreatedUser); | ||
256 | break; | ||
257 | case "logoff-user": | 253 | case "logoff-user": |
258 | 254 | ||
259 | if (cmdparams.Length >= 3) | 255 | if (cmdparams.Length >= 3) |