diff options
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index e18191f..df251ec 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -7,6 +7,7 @@ using OpenSim.Framework.UserManagement; | |||
7 | using OpenSim.Framework.Utilities; | 7 | using OpenSim.Framework.Utilities; |
8 | using OpenSim.Framework.Configuration; | 8 | using OpenSim.Framework.Configuration; |
9 | using OpenSim.Framework.Types; | 9 | using OpenSim.Framework.Types; |
10 | using OpenSim.Framework.Console; | ||
10 | 11 | ||
11 | namespace OpenSim.Grid.UserServer | 12 | namespace OpenSim.Grid.UserServer |
12 | { | 13 | { |
@@ -38,7 +39,7 @@ namespace OpenSim.Grid.UserServer | |||
38 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; | 39 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; |
39 | 40 | ||
40 | // Destination | 41 | // Destination |
41 | Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); | 42 | MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); |
42 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); | 43 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); |
43 | response.SimPort = (Int32)SimInfo.serverPort; | 44 | response.SimPort = (Int32)SimInfo.serverPort; |
44 | response.RegionX = SimInfo.regionLocX; | 45 | response.RegionX = SimInfo.regionLocX; |
@@ -49,7 +50,7 @@ namespace OpenSim.Grid.UserServer | |||
49 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; | 50 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; |
50 | 51 | ||
51 | // Notify the target of an incoming user | 52 | // Notify the target of an incoming user |
52 | Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); | 53 | MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); |
53 | 54 | ||
54 | // Prepare notification | 55 | // Prepare notification |
55 | Hashtable SimParams = new Hashtable(); | 56 | Hashtable SimParams = new Hashtable(); |
@@ -71,7 +72,7 @@ namespace OpenSim.Grid.UserServer | |||
71 | theUser.currentAgent.currentRegion = SimInfo.UUID; | 72 | theUser.currentAgent.currentRegion = SimInfo.UUID; |
72 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; | 73 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; |
73 | 74 | ||
74 | System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); | 75 | MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI); |
75 | // Send | 76 | // Send |
76 | try | 77 | try |
77 | { | 78 | { |
@@ -84,6 +85,7 @@ namespace OpenSim.Grid.UserServer | |||
84 | { | 85 | { |
85 | case WebExceptionStatus.Timeout: | 86 | case WebExceptionStatus.Timeout: |
86 | //TODO: Send him to nearby or default region instead | 87 | //TODO: Send him to nearby or default region instead |
88 | MainLog.Instance.Verbose("Unable to connect to " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); | ||
87 | break; | 89 | break; |
88 | 90 | ||
89 | default: | 91 | default: |