aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer/Main.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/UserServer/Main.cs')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index e487648..6441b7a 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using log4net.Config; 35using log4net.Config;
36using OpenSim.Framework; 36using OpenSim.Framework;
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.UserServer
58 public MessageServersConnector m_messagesService; 58 public MessageServersConnector m_messagesService;
59 protected IInterServiceInventoryServices m_interServiceInventoryService; 59 protected IInterServiceInventoryServices m_interServiceInventoryService;
60 60
61 private LLUUID m_lastCreatedUser = LLUUID.Random(); 61 private UUID m_lastCreatedUser = UUID.Random();
62 62
63 public static void Main(string[] args) 63 public static void Main(string[] args)
64 { 64 {
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer
92 { 92 {
93 base.Startup(); 93 base.Startup();
94 94
95 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 95 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.Xml")));
96 96
97 m_stats = StatsManager.StartCollectingUserStats(); 97 m_stats = StatsManager.StartCollectingUserStats();
98 98
@@ -183,7 +183,7 @@ namespace OpenSim.Grid.UserServer
183 183
184 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); 184 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
185 185
186 LLUUID userID = new LLUUID(); 186 UUID userID = new UUID();
187 187
188 try 188 try
189 { 189 {
@@ -209,7 +209,7 @@ namespace OpenSim.Grid.UserServer
209 { 209 {
210 m_log.ErrorFormat( 210 m_log.ErrorFormat(
211 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 211 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
212 Cfg.InventoryUrl + "CreateInventory/", userID.UUID); 212 Cfg.InventoryUrl + "CreateInventory/", userID);
213 } 213 }
214 catch (Exception e) 214 catch (Exception e)
215 { 215 {
@@ -240,8 +240,8 @@ namespace OpenSim.Grid.UserServer
240 case "test-inventory": 240 case "test-inventory":
241 // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); 241 // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
242 // requester.ReturnResponseVal = TestResponse; 242 // requester.ReturnResponseVal = TestResponse;
243 // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); 243 // requester.BeginPostObject<UUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
244 SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>( 244 SynchronousRestObjectPoster.BeginPostObject<UUID, List<InventoryFolderBase>>(
245 "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); 245 "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser);
246 break; 246 break;
247 247
@@ -322,12 +322,12 @@ namespace OpenSim.Grid.UserServer
322 m_console.Notice("response got"); 322 m_console.Notice("response got");
323 } 323 }
324 324
325 public void NotifyMessageServersUserLoggOff(LLUUID agentID) 325 public void NotifyMessageServersUserLoggOff(UUID agentID)
326 { 326 {
327 m_messagesService.TellMessageServersAboutUserLogoff(agentID); 327 m_messagesService.TellMessageServersAboutUserLogoff(agentID);
328 } 328 }
329 329
330 public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 330 public void NotifyMessageServersUserLoggedInToLocation(UUID agentID, UUID sessionID, UUID RegionID,
331 ulong regionhandle, float positionX, float positionY, 331 ulong regionhandle, float positionX, float positionY,
332 float positionZ, string firstname, string lastname) 332 float positionZ, string firstname, string lastname)
333 { 333 {
@@ -335,4 +335,4 @@ namespace OpenSim.Grid.UserServer
335 positionY, positionZ, firstname, lastname); 335 positionY, positionZ, firstname, lastname);
336 } 336 }
337 } 337 }
338} \ No newline at end of file 338}