diff options
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 14 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index fddfb17..029c0a6e 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -36,9 +36,9 @@ namespace OpenSim.Framework.UserManagement | |||
36 | /// <param name="request">The XMLRPC request</param> | 36 | /// <param name="request">The XMLRPC request</param> |
37 | /// <returns>The response to send</returns> | 37 | /// <returns>The response to send</returns> |
38 | public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) | 38 | public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) |
39 | { | 39 | { |
40 | 40 | ||
41 | System.Console.WriteLine("Attempting login now..."); | 41 | MainLog.Instance.Verbose("Attempting login now..."); |
42 | XmlRpcResponse response = new XmlRpcResponse(); | 42 | XmlRpcResponse response = new XmlRpcResponse(); |
43 | Hashtable requestData = (Hashtable)request.Params[0]; | 43 | Hashtable requestData = (Hashtable)request.Params[0]; |
44 | 44 | ||
@@ -121,8 +121,8 @@ namespace OpenSim.Framework.UserManagement | |||
121 | this.CustomiseResponse(logResponse, userProfile); | 121 | this.CustomiseResponse(logResponse, userProfile); |
122 | } | 122 | } |
123 | catch (Exception e) | 123 | catch (Exception e) |
124 | { | 124 | { |
125 | System.Console.WriteLine(e.ToString()); | 125 | MainLog.Instance.Verbose(e.ToString()); |
126 | return logResponse.CreateDeadRegionResponse(); | 126 | return logResponse.CreateDeadRegionResponse(); |
127 | //return logResponse.ToXmlRpcResponse(); | 127 | //return logResponse.ToXmlRpcResponse(); |
128 | } | 128 | } |
@@ -132,8 +132,8 @@ namespace OpenSim.Framework.UserManagement | |||
132 | } | 132 | } |
133 | 133 | ||
134 | catch (Exception E) | 134 | catch (Exception E) |
135 | { | 135 | { |
136 | System.Console.WriteLine(E.ToString()); | 136 | MainLog.Instance.Verbose(E.ToString()); |
137 | } | 137 | } |
138 | //} | 138 | //} |
139 | } | 139 | } |
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index e18191f..ad26840 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -37,8 +37,8 @@ namespace OpenSim.Grid.UserServer | |||
37 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + | 37 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + |
38 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; | 38 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; |
39 | 39 | ||
40 | // Destination | 40 | // Destination |
41 | Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); | 41 | MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); |
42 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); | 42 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); |
43 | response.SimPort = (Int32)SimInfo.serverPort; | 43 | response.SimPort = (Int32)SimInfo.serverPort; |
44 | response.RegionX = SimInfo.regionLocX; | 44 | response.RegionX = SimInfo.regionLocX; |
@@ -48,8 +48,8 @@ namespace OpenSim.Grid.UserServer | |||
48 | string capsPath = Util.GetRandomCapsPath(); | 48 | string capsPath = Util.GetRandomCapsPath(); |
49 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; | 49 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; |
50 | 50 | ||
51 | // Notify the target of an incoming user | 51 | // Notify the target of an incoming user |
52 | Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); | 52 | MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); |
53 | 53 | ||
54 | // Prepare notification | 54 | // Prepare notification |
55 | Hashtable SimParams = new Hashtable(); | 55 | Hashtable SimParams = new Hashtable(); |
@@ -69,9 +69,9 @@ namespace OpenSim.Grid.UserServer | |||
69 | 69 | ||
70 | // Update agent with target sim | 70 | // Update agent with target sim |
71 | theUser.currentAgent.currentRegion = SimInfo.UUID; | 71 | theUser.currentAgent.currentRegion = SimInfo.UUID; |
72 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; | 72 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; |
73 | 73 | ||
74 | System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); | 74 | MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI); |
75 | // Send | 75 | // Send |
76 | try | 76 | try |
77 | { | 77 | { |