aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Server/Handlers/Login/LLLoginHandlers.cs14
-rw-r--r--OpenSim/Services/Interfaces/ILoginService.cs2
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs7
3 files changed, 7 insertions, 16 deletions
diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
index 5d672c3..b8788ac 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs
@@ -132,18 +132,12 @@ namespace OpenSim.Server.Handlers.Login
132 132
133 //m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion); 133 //m_log.InfoFormat("[LOGIN]: XMLRPC Login Requested for {0} {1}, starting in {2}, using {3}", first, last, startLocation, clientVersion);
134 134
135
136 bool LibOMVclient = false;
137 if (request.Params.Count > 4 && (string)request.Params[4] == "gridproxy")
138 LibOMVclient = true;
139
140 LoginResponse reply = null; 135 LoginResponse reply = null;
141 reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient, LibOMVclient); 136 reply = m_LocalService.Login(first, last, passwd, startLocation, scopeID, clientVersion, channel, mac, id0, remoteClient);
142 137
143 XmlRpcResponse response = new XmlRpcResponse(); 138 XmlRpcResponse response = new XmlRpcResponse();
144 response.Value = reply.ToHashtable(); 139 response.Value = reply.ToHashtable();
145 return response; 140 return response;
146
147 } 141 }
148 } 142 }
149 143
@@ -221,7 +215,7 @@ namespace OpenSim.Server.Handlers.Login
221 215
222 LoginResponse reply = null; 216 LoginResponse reply = null;
223 reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID, 217 reply = m_LocalService.Login(map["first"].AsString(), map["last"].AsString(), map["passwd"].AsString(), startLocation, scopeID,
224 map["version"].AsString(), map["channel"].AsString(), map["mac"].AsString(), map["id0"].AsString(), remoteClient,false); 218 map["version"].AsString(), map["channel"].AsString(), map["mac"].AsString(), map["id0"].AsString(), remoteClient);
225 return reply.ToOSDMap(); 219 return reply.ToOSDMap();
226 220
227 } 221 }
@@ -263,8 +257,8 @@ namespace OpenSim.Server.Handlers.Login
263 IPEndPoint endPoint = 257 IPEndPoint endPoint =
264 (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint(); 258 (sender as WebSocketHttpServerHandler).GetRemoteIPEndpoint();
265 LoginResponse reply = null; 259 LoginResponse reply = null;
266 reply = m_LocalService.Login(first, last, passwd, start, scope, version, 260 reply = m_LocalService.Login(first, last, passwd, start, scope,
267 channel, mac, id0, endPoint,false); 261 version, channel, mac, id0, endPoint);
268 sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap())); 262 sock.SendMessage(OSDParser.SerializeJsonString(reply.ToOSDMap()));
269 263
270 } 264 }
diff --git a/OpenSim/Services/Interfaces/ILoginService.cs b/OpenSim/Services/Interfaces/ILoginService.cs
index 7c44cd8..c37e666 100644
--- a/OpenSim/Services/Interfaces/ILoginService.cs
+++ b/OpenSim/Services/Interfaces/ILoginService.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Services.Interfaces
48 public interface ILoginService 48 public interface ILoginService
49 { 49 {
50 LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, 50 LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID,
51 string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient); 51 string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP);
52 Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP); 52 Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP);
53 } 53 }
54 54
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 6681f1a..135a8f3 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -266,18 +266,15 @@ namespace OpenSim.Services.LLLoginService
266 } 266 }
267 267
268 public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, 268 public LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID,
269 string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient) 269 string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP)
270 { 270 {
271 bool success = false; 271 bool success = false;
272 UUID session = UUID.Random(); 272 UUID session = UUID.Random();
273 273
274 string processedMessage; 274 string processedMessage;
275 275
276 if (clientVersion.Contains("Radegast"))
277 LibOMVclient = false;
278
279 m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", 276 m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ",
280 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); 277 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0);
281 278
282 try 279 try
283 { 280 {