aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/LoginService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index ce8aa23..d656559 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -29,21 +29,22 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection;
32using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
33using System.Threading; 34using System.Threading;
35using System.Web;
34using libsecondlife; 36using libsecondlife;
35using libsecondlife.StructuredData; 37using libsecondlife.StructuredData;
38using log4net;
36using Nwc.XmlRpc; 39using Nwc.XmlRpc;
37
38using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
39using OpenSim.Framework.Console;
40using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
41 42
42namespace OpenSim.Framework.UserManagement 43namespace OpenSim.Framework.UserManagement
43{ 44{
44 public abstract class LoginService 45 public abstract class LoginService
45 { 46 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 48
48 protected string m_welcomeMessage = "Welcome to OpenSim"; 49 protected string m_welcomeMessage = "Welcome to OpenSim";
49 protected UserManagerBase m_userManager = null; 50 protected UserManagerBase m_userManager = null;
@@ -159,7 +160,7 @@ namespace OpenSim.Framework.UserManagement
159 { 160 {
160 webloginkey = new LLUUID((string)requestData["web_login_key"]); 161 webloginkey = new LLUUID((string)requestData["web_login_key"]);
161 } 162 }
162 catch (System.Exception e) 163 catch (Exception e)
163 { 164 {
164 m_log.InfoFormat( 165 m_log.InfoFormat(
165 "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", 166 "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}",
@@ -514,7 +515,7 @@ namespace OpenSim.Framework.UserManagement
514 statuscode = 301; 515 statuscode = 301;
515 516
516 string redirectURL = "about:blank?redirect-http-hack=" + 517 string redirectURL = "about:blank?redirect-http-hack=" +
517 System.Web.HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + 518 HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
518 lastname + 519 lastname +
519 "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); 520 "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
520 //m_log.Info("[WEB]: R:" + redirectURL); 521 //m_log.Info("[WEB]: R:" + redirectURL);