diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index ef4b82d..4d1328e 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -78,7 +78,7 @@ namespace OpenSim.Grid.UserServer | |||
78 | theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; | 78 | theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; |
79 | 79 | ||
80 | // Destination | 80 | // Destination |
81 | MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + | 81 | MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + |
82 | SimInfo.regionLocY); | 82 | SimInfo.regionLocY); |
83 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); | 83 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); |
84 | response.SimPort = (Int32)SimInfo.serverPort; | 84 | response.SimPort = (Int32)SimInfo.serverPort; |
@@ -90,7 +90,7 @@ namespace OpenSim.Grid.UserServer | |||
90 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; | 90 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; |
91 | 91 | ||
92 | // Notify the target of an incoming user | 92 | // Notify the target of an incoming user |
93 | MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); | 93 | MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); |
94 | 94 | ||
95 | // Prepare notification | 95 | // Prepare notification |
96 | Hashtable SimParams = new Hashtable(); | 96 | Hashtable SimParams = new Hashtable(); |
@@ -112,7 +112,7 @@ namespace OpenSim.Grid.UserServer | |||
112 | theUser.currentAgent.currentRegion = SimInfo.UUID; | 112 | theUser.currentAgent.currentRegion = SimInfo.UUID; |
113 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; | 113 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; |
114 | 114 | ||
115 | MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI); | 115 | MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI); |
116 | // Send | 116 | // Send |
117 | 117 | ||
118 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); | 118 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); |
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.UserServer | |||
146 | theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; | 146 | theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; |
147 | 147 | ||
148 | // Destination | 148 | // Destination |
149 | MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + | 149 | MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + |
150 | SimInfo.regionLocY); | 150 | SimInfo.regionLocY); |
151 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); | 151 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); |
152 | response.SimPort = (Int32)SimInfo.serverPort; | 152 | response.SimPort = (Int32)SimInfo.serverPort; |
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.UserServer | |||
158 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; | 158 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; |
159 | 159 | ||
160 | // Notify the target of an incoming user | 160 | // Notify the target of an incoming user |
161 | MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); | 161 | MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); |
162 | 162 | ||
163 | // Update agent with target sim | 163 | // Update agent with target sim |
164 | theUser.currentAgent.currentRegion = SimInfo.UUID; | 164 | theUser.currentAgent.currentRegion = SimInfo.UUID; |
@@ -180,7 +180,7 @@ namespace OpenSim.Grid.UserServer | |||
180 | ArrayList SendParams = new ArrayList(); | 180 | ArrayList SendParams = new ArrayList(); |
181 | SendParams.Add(SimParams); | 181 | SendParams.Add(SimParams); |
182 | 182 | ||
183 | MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI); | 183 | MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI); |
184 | // Send | 184 | // Send |
185 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); | 185 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); |
186 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); | 186 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); |
@@ -188,8 +188,8 @@ namespace OpenSim.Grid.UserServer | |||
188 | 188 | ||
189 | catch (Exception e) | 189 | catch (Exception e) |
190 | { | 190 | { |
191 | MainLog.Instance.Warn("Default region also not available"); | 191 | MainLog.Instance.Warn("LOGIN", "Default region also not available"); |
192 | MainLog.Instance.Verbose(e.ToString()); | 192 | MainLog.Instance.Verbose("LOGIN", e.ToString()); |
193 | } | 193 | } |
194 | 194 | ||
195 | } | 195 | } |