diff options
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 6b5d3ff..0403405 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -94,8 +94,10 @@ namespace OpenSim.Grid.UserServer | |||
94 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; | 94 | response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; |
95 | 95 | ||
96 | // Notify the target of an incoming user | 96 | // Notify the target of an incoming user |
97 | MainLog.Instance.Verbose("LOGIN", SimInfo.regionName + " (" + SimInfo.serverURI + ") " + | 97 | //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into |
98 | SimInfo.regionLocX + "," + SimInfo.regionLocY); | 98 | //CFK: the next one for X & Y and comment this one. |
99 | //CFK: MainLog.Instance.Verbose("LOGIN", SimInfo.regionName + " (" + SimInfo.serverURI + ") " + | ||
100 | //CFK: SimInfo.regionLocX + "," + SimInfo.regionLocY); | ||
99 | 101 | ||
100 | // Prepare notification | 102 | // Prepare notification |
101 | Hashtable SimParams = new Hashtable(); | 103 | Hashtable SimParams = new Hashtable(); |
@@ -117,9 +119,9 @@ namespace OpenSim.Grid.UserServer | |||
117 | theUser.currentAgent.currentRegion = SimInfo.UUID; | 119 | theUser.currentAgent.currentRegion = SimInfo.UUID; |
118 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; | 120 | theUser.currentAgent.currentHandle = SimInfo.regionHandle; |
119 | 121 | ||
120 | MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI); | 122 | MainLog.Instance.Verbose("LOGIN", "Informing " + SimInfo.httpServerURI + " @ " + |
121 | // Send | 123 | SimInfo.regionLocX + "," + SimInfo.regionLocY); |
122 | 124 | ||
123 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); | 125 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); |
124 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); | 126 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); |
125 | } | 127 | } |
@@ -136,7 +138,7 @@ namespace OpenSim.Grid.UserServer | |||
136 | 138 | ||
137 | MainLog.Instance.Warn( | 139 | MainLog.Instance.Warn( |
138 | "LOGIN", | 140 | "LOGIN", |
139 | "Home region not available: sending to default region " + defaultHandle.ToString()); | 141 | "Home region not available: sending to default " + defaultHandle.ToString()); |
140 | 142 | ||
141 | SimInfo = new RegionProfileData(); | 143 | SimInfo = new RegionProfileData(); |
142 | try | 144 | try |