aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices/OpenGridServices.UserServer/Main.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-06-09 01:21:53 +0000
committerAdam Frisby2007-06-09 01:21:53 +0000
commit26b208d738c1e33140442b27ab71bdac685b4c2c (patch)
treeedf518bc66cc503a04dd864c7356a1fc6eaaedf3 /OpenGridServices/OpenGridServices.UserServer/Main.cs
parent*Adding configuration settings for master avatars (diff)
downloadopensim-SC-26b208d738c1e33140442b27ab71bdac685b4c2c.zip
opensim-SC-26b208d738c1e33140442b27ab71bdac685b4c2c.tar.gz
opensim-SC-26b208d738c1e33140442b27ab71bdac685b4c2c.tar.bz2
opensim-SC-26b208d738c1e33140442b27ab71bdac685b4c2c.tar.xz
* Sugilite user server can now return user profile information by account name (Hi MingChen) - uses the REST GET /user/name/ method.
Diffstat (limited to 'OpenGridServices/OpenGridServices.UserServer/Main.cs')
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/Main.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
index bb20576..f2cefe5 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs
@@ -53,9 +53,7 @@ namespace OpenGridServices.UserServer
53 private UserConfig Cfg; 53 private UserConfig Cfg;
54 protected IGenericConfig localXMLConfig; 54 protected IGenericConfig localXMLConfig;
55 55
56 public UserManager m_userManager; // Replaces below. 56 public UserManager m_userManager;
57
58 //private UserProfileManager m_userProfileManager; // Depreciated
59 57
60 public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); 58 public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();
61 59
@@ -64,7 +62,7 @@ namespace OpenGridServices.UserServer
64 [STAThread] 62 [STAThread]
65 public static void Main(string[] args) 63 public static void Main(string[] args)
66 { 64 {
67 Console.WriteLine("Starting...\n"); 65 Console.WriteLine("Launching UserServer...");
68 66
69 OpenUser_Main userserver = new OpenUser_Main(); 67 OpenUser_Main userserver = new OpenUser_Main();
70 68
@@ -108,9 +106,11 @@ namespace OpenGridServices.UserServer
108 BaseHttpServer httpServer = new BaseHttpServer(8002); 106 BaseHttpServer httpServer = new BaseHttpServer(8002);
109 107
110 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); 108 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
109 httpServer.AddRestHandler("GET", "/user/name/", m_userManager.RestGetUserMethodName);
111 httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod); 110 httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod);
112 111
113 httpServer.Start(); 112 httpServer.Start();
113 m_console.Status("Userserver 0.3 - Startup complete");
114 } 114 }
115 115
116 116