aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorDiva Canto2009-12-31 17:18:55 -0800
committerDiva Canto2009-12-31 17:18:55 -0800
commit130c80efe004fa06808cc639ad8e2ee31c35744b (patch)
tree7ca8b57f70c36672ed06851f1f0efd0c36096c20 /OpenSim/Server/Handlers
parent* Added the Login server handlers that were lost in yesterday's commit grief (diff)
downloadopensim-SC_OLD-130c80efe004fa06808cc639ad8e2ee31c35744b.zip
opensim-SC_OLD-130c80efe004fa06808cc639ad8e2ee31c35744b.tar.gz
opensim-SC_OLD-130c80efe004fa06808cc639ad8e2ee31c35744b.tar.bz2
opensim-SC_OLD-130c80efe004fa06808cc639ad8e2ee31c35744b.tar.xz
A lot more beef on the login service. The LLLoginResponse is a MONSTER! Almost done...
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Login/LLLoginHandlers.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
index b973c11..aaa958b 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -68,12 +68,22 @@ namespace OpenSim.Server.Handlers.Login
68 requestData.ContainsKey("last") && requestData["last"] != null && 68 requestData.ContainsKey("last") && requestData["last"] != null &&
69 requestData.ContainsKey("passwd") && requestData["passwd"] != null) 69 requestData.ContainsKey("passwd") && requestData["passwd"] != null)
70 { 70 {
71 string first = requestData["first"].ToString();
72 string last = requestData["last"].ToString();
73 string passwd = requestData["passwd"].ToString();
71 string startLocation = string.Empty; 74 string startLocation = string.Empty;
72 if (requestData.ContainsKey("start")) 75 if (requestData.ContainsKey("start"))
73 startLocation = requestData["start"].ToString(); 76 startLocation = requestData["start"].ToString();
74 77
78 string clientVersion = "Unknown";
79 if (requestData.Contains("version"))
80 clientVersion = requestData["version"].ToString();
81 // We should do something interesting with the client version...
82
83 m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion);
84
75 LoginResponse reply = null; 85 LoginResponse reply = null;
76 reply = m_LocalService.Login(requestData["first"].ToString(), requestData["last"].ToString(), requestData["passwd"].ToString(), startLocation); 86 reply = m_LocalService.Login(first, last, passwd, startLocation, remoteClient);
77 87
78 XmlRpcResponse response = new XmlRpcResponse(); 88 XmlRpcResponse response = new XmlRpcResponse();
79 response.Value = reply.ToHashtable(); 89 response.Value = reply.ToHashtable();
@@ -102,7 +112,7 @@ namespace OpenSim.Server.Handlers.Login
102 m_log.Info("[LOGIN]: LLSD Login Requested for: '" + map["first"].AsString() + "' '" + map["last"].AsString() + "' / " + startLocation); 112 m_log.Info("[LOGIN]: LLSD Login Requested for: '" + map["first"].AsString() + "' '" + map["last"].AsString() + "' / " + startLocation);
103 113
104 LoginResponse reply = null; 114 LoginResponse reply = null;
105 reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation); 115 reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, remoteClient);
106 return reply.ToOSDMap(); 116 return reply.ToOSDMap();
107 117
108 } 118 }