From 6ef9d4da901a346c232458317cca6268da888e2e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 18 Aug 2008 00:39:10 +0000 Subject: Formatting cleanup. --- OpenSim/Grid/UserServer/Main.cs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'OpenSim/Grid/UserServer/Main.cs') diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 9b74dbc..9a3e431 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -90,7 +90,7 @@ namespace OpenSim.Grid.UserServer public override void Startup() { base.Startup(); - + Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); m_stats = StatsManager.StartCollectingUserStats(); @@ -101,11 +101,11 @@ namespace OpenSim.Grid.UserServer m_gridInfoService = new GridInfoService(); - m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); + m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); m_loginService = new UserLoginService( - m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); - + m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); + m_messagesService = new MessageServersConnector(); m_loginService.OnUserLoggedInAtLocation += NotifyMessageServersUserLoggedInToLocation; @@ -151,7 +151,6 @@ namespace OpenSim.Grid.UserServer m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); - m_httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod)); @@ -188,7 +187,7 @@ namespace OpenSim.Grid.UserServer tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); LLUUID userID = new LLUUID(); - + try { userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); @@ -199,7 +198,7 @@ namespace OpenSim.Grid.UserServer } try - { + { if (!m_interServiceInventoryService.CreateNewUserInventory(userID)) { throw new Exception( @@ -245,9 +244,9 @@ namespace OpenSim.Grid.UserServer // requester.ReturnResponseVal = TestResponse; // requester.BeginPostObject(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); SynchronousRestObjectPoster.BeginPostObject>( - "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); - break; - + "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); + break; + case "logoff-user": if (cmdparams.Length >= 3) @@ -279,7 +278,7 @@ namespace OpenSim.Grid.UserServer m_loginService.LogOffUser(theUser, message); theUser.CurrentAgent.AgentOnline = false; - + m_loginService.CommitAgent(ref theUser); } else -- cgit v1.1