aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.UserServer/Main.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-05-20 16:19:36 +0000
committerAdam Frisby2007-05-20 16:19:36 +0000
commit57abbfa85af857d46f65848b907baf0c670cfc14 (patch)
tree1fa22ef7ef522522e571c545020335a302f04a82 /OpenGridServices.UserServer/Main.cs
parentNeed to add the grid portion next to test this thing (diff)
downloadopensim-SC_OLD-57abbfa85af857d46f65848b907baf0c670cfc14.zip
opensim-SC_OLD-57abbfa85af857d46f65848b907baf0c670cfc14.tar.gz
opensim-SC_OLD-57abbfa85af857d46f65848b907baf0c670cfc14.tar.bz2
opensim-SC_OLD-57abbfa85af857d46f65848b907baf0c670cfc14.tar.xz
Adam proudly presents: A new user/login server - fresh to you from his desktop, and completely untested!
Diffstat (limited to 'OpenGridServices.UserServer/Main.cs')
-rw-r--r--OpenGridServices.UserServer/Main.cs20
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs
index 1c6ad8c..5006e6d 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices.UserServer/Main.cs
@@ -52,7 +52,7 @@ namespace OpenGridServices.UserServer
52 52
53 public UserManager m_userManager; // Replaces below. 53 public UserManager m_userManager; // Replaces below.
54 54
55 private UserProfileManager m_userProfileManager; 55 //private UserProfileManager m_userProfileManager; // Depreciated
56 56
57 public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>(); 57 public Dictionary<LLUUID, UserProfile> UserSessions = new Dictionary<LLUUID, UserProfile>();
58 58
@@ -93,17 +93,18 @@ namespace OpenGridServices.UserServer
93 93
94 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection"); 94 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection");
95 m_userManager = new UserManager(); 95 m_userManager = new UserManager();
96 m_userManager._config = Cfg;
96 97
97 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Creating user profile manager"); 98 //MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Creating user profile manager");
98 m_userProfileManager = new UserProfileManager(); 99 //m_userProfileManager = new UserProfileManager();
99 m_userProfileManager.InitUserProfiles(); 100 //m_userProfileManager.InitUserProfiles();
100 m_userProfileManager.SetKeys(Cfg.GridSendKey, Cfg.GridRecvKey, Cfg.GridServerURL, Cfg.DefaultStartupMsg); 101 //m_userProfileManager.SetKeys(Cfg.GridSendKey, Cfg.GridRecvKey, Cfg.GridServerURL, Cfg.DefaultStartupMsg);
101 102
102 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process"); 103 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
103 BaseHttpServer httpServer = new BaseHttpServer(8002); 104 BaseHttpServer httpServer = new BaseHttpServer(8002);
104 105
105 httpServer.AddXmlRPCHandler("login_to_simulator", m_userProfileManager.XmlRpcLoginMethod); 106 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
106 httpServer.AddRestHandler("DELETE", "/usersessions/", m_userProfileManager.RestDeleteUserSessionMethod); 107 httpServer.AddRestHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod);
107 108
108 httpServer.Start(); 109 httpServer.Start();
109 } 110 }
@@ -114,7 +115,9 @@ namespace OpenGridServices.UserServer
114 switch (what) 115 switch (what)
115 { 116 {
116 case "user": 117 case "user":
117 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Creating new user profile"); 118 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"Commandline user creation is currently disabled.");
119 break;
120 /*
118 string tempfirstname; 121 string tempfirstname;
119 string templastname; 122 string templastname;
120 string tempMD5Passwd; 123 string tempMD5Passwd;
@@ -138,6 +141,7 @@ namespace OpenGridServices.UserServer
138 newuser.homepos = new LLVector3(128f, 128f, 150f); 141 newuser.homepos = new LLVector3(128f, 128f, 150f);
139 m_userProfileManager.SaveUserProfiles(); 142 m_userProfileManager.SaveUserProfiles();
140 break; 143 break;
144 */
141 } 145 }
142 } 146 }
143 147