aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer/Main.cs
diff options
context:
space:
mode:
authorJeff Ames2008-08-18 00:39:10 +0000
committerJeff Ames2008-08-18 00:39:10 +0000
commit6ef9d4da901a346c232458317cca6268da888e2e (patch)
treedd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Grid/UserServer/Main.cs
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.zip
opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz
opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2
opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Grid/UserServer/Main.cs')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs21
1 files changed, 10 insertions, 11 deletions
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
90 public override void Startup() 90 public override void Startup()
91 { 91 {
92 base.Startup(); 92 base.Startup();
93 93
94 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 94 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
95 95
96 m_stats = StatsManager.StartCollectingUserStats(); 96 m_stats = StatsManager.StartCollectingUserStats();
@@ -101,11 +101,11 @@ namespace OpenSim.Grid.UserServer
101 101
102 m_gridInfoService = new GridInfoService(); 102 m_gridInfoService = new GridInfoService();
103 103
104 m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); 104 m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);
105 105
106 m_loginService = new UserLoginService( 106 m_loginService = new UserLoginService(
107 m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); 107 m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
108 108
109 m_messagesService = new MessageServersConnector(); 109 m_messagesService = new MessageServersConnector();
110 110
111 m_loginService.OnUserLoggedInAtLocation += NotifyMessageServersUserLoggedInToLocation; 111 m_loginService.OnUserLoggedInAtLocation += NotifyMessageServersUserLoggedInToLocation;
@@ -151,7 +151,6 @@ namespace OpenSim.Grid.UserServer
151 151
152 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); 152 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
153 m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); 153 m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
154
155 154
156 m_httpServer.AddStreamHandler( 155 m_httpServer.AddStreamHandler(
157 new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod)); 156 new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod));
@@ -188,7 +187,7 @@ namespace OpenSim.Grid.UserServer
188 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); 187 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
189 188
190 LLUUID userID = new LLUUID(); 189 LLUUID userID = new LLUUID();
191 190
192 try 191 try
193 { 192 {
194 userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY); 193 userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
@@ -199,7 +198,7 @@ namespace OpenSim.Grid.UserServer
199 } 198 }
200 199
201 try 200 try
202 { 201 {
203 if (!m_interServiceInventoryService.CreateNewUserInventory(userID)) 202 if (!m_interServiceInventoryService.CreateNewUserInventory(userID))
204 { 203 {
205 throw new Exception( 204 throw new Exception(
@@ -245,9 +244,9 @@ namespace OpenSim.Grid.UserServer
245 // requester.ReturnResponseVal = TestResponse; 244 // requester.ReturnResponseVal = TestResponse;
246 // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); 245 // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
247 SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>( 246 SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(
248 "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); 247 "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser);
249 break; 248 break;
250 249
251 case "logoff-user": 250 case "logoff-user":
252 251
253 if (cmdparams.Length >= 3) 252 if (cmdparams.Length >= 3)
@@ -279,7 +278,7 @@ namespace OpenSim.Grid.UserServer
279 m_loginService.LogOffUser(theUser, message); 278 m_loginService.LogOffUser(theUser, message);
280 279
281 theUser.CurrentAgent.AgentOnline = false; 280 theUser.CurrentAgent.AgentOnline = false;
282 281
283 m_loginService.CommitAgent(ref theUser); 282 m_loginService.CommitAgent(ref theUser);
284 } 283 }
285 else 284 else