diff options
author | Justin Clarke Casey | 2008-03-23 21:21:39 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-23 21:21:39 +0000 |
commit | da531fa9e124394228a7c7597bd50e548af81efb (patch) | |
tree | f522f4f115b8bf5db07b45ddcc1c60261dcde680 /OpenSim/Grid/UserServer/UserLoginService.cs | |
parent | Implements llGetParcelPrimOwners() (diff) | |
download | opensim-SC-da531fa9e124394228a7c7597bd50e548af81efb.zip opensim-SC-da531fa9e124394228a7c7597bd50e548af81efb.tar.gz opensim-SC-da531fa9e124394228a7c7597bd50e548af81efb.tar.bz2 opensim-SC-da531fa9e124394228a7c7597bd50e548af81efb.tar.xz |
* Start passing around a region server's http port in RegionInfo.
* This means that caps methods (editing scripts, poss map functions, etc) on non-home regions should now work with servers which are listening for http ports on a non default
(9000) port.
* If you are running a region server, this may only work properly once your grid server upgrades to this revision
* PLEASE NOTE: This shouldn't cause inter-region problems if one end of the connection hasn't upgraded to this revision. However if it does, the instability will persist until
the grid and region (and possibly all the region's neighbours) have upgraded to this revision.
* This revision also adds extra login related messages, both for success and failure conditions
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 823733f..20273ab 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -174,9 +174,9 @@ namespace OpenSim.Grid.UserServer | |||
174 | 174 | ||
175 | // Update agent with target sim | 175 | // Update agent with target sim |
176 | 176 | ||
177 | m_log.Info("[LOGIN]: Telling " | 177 | m_log.InfoFormat( |
178 | + SimInfo.regionName + " @ " + SimInfo.httpServerURI + " " + | 178 | "[LOGIN]: Telling region {0} @ {1},{2} ({3}) to expect user connection", |
179 | SimInfo.regionLocX + "," + SimInfo.regionLocY + " to expect user connection"); | 179 | SimInfo.regionName, response.RegionX, response.RegionY, SimInfo.httpServerURI); |
180 | 180 | ||
181 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); | 181 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); |
182 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); | 182 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); |