diff options
| author | Johan Berntsson | 2008-03-04 05:31:54 +0000 |
|---|---|---|
| committer | Johan Berntsson | 2008-03-04 05:31:54 +0000 |
| commit | 279e0061c515ee0a03036bef68eea9738273d785 (patch) | |
| tree | 4502228eb7b87a760e0b0e67aded9d1d870d0bed /OpenSim/Grid/UserServer | |
| parent | Added copyright heaaders. Minor cleanup. (diff) | |
| download | opensim-SC_OLD-279e0061c515ee0a03036bef68eea9738273d785.zip opensim-SC_OLD-279e0061c515ee0a03036bef68eea9738273d785.tar.gz opensim-SC_OLD-279e0061c515ee0a03036bef68eea9738273d785.tar.bz2 opensim-SC_OLD-279e0061c515ee0a03036bef68eea9738273d785.tar.xz | |
Merged 3Di code that provides scene and avatar serialization, and plugin support for region move/split/merge. See ThirdParty/3Di/README.txt. Unless the new modules are used there should be no noticeable changes when running OpenSim.
Diffstat (limited to 'OpenSim/Grid/UserServer')
| -rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 0b832f4..e03ac3a 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
| @@ -99,8 +99,8 @@ namespace OpenSim.Grid.UserServer | |||
| 99 | //CFK: the next one for X & Y and comment this one. | 99 | //CFK: the next one for X & Y and comment this one. |
| 100 | //CFK: m_log.Info("[LOGIN]: CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + | 100 | //CFK: m_log.Info("[LOGIN]: CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + |
| 101 | //CFK: "; Region Y: " + SimInfo.regionLocY); | 101 | //CFK: "; Region Y: " + SimInfo.regionLocY); |
| 102 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); | 102 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverURI.Split(new char[] { '/', ':' })[3]).ToString(); |
| 103 | response.SimPort = (uint) SimInfo.serverPort; | 103 | response.SimPort = uint.Parse(SimInfo.serverURI.Split(new char[] { '/', ':' })[4]); |
| 104 | response.RegionX = SimInfo.regionLocX; | 104 | response.RegionX = SimInfo.regionLocX; |
| 105 | response.RegionY = SimInfo.regionLocY; | 105 | response.RegionY = SimInfo.regionLocY; |
| 106 | 106 | ||
| @@ -190,8 +190,8 @@ namespace OpenSim.Grid.UserServer | |||
| 190 | m_log.Info("[LOGIN]: " + | 190 | m_log.Info("[LOGIN]: " + |
| 191 | "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + | 191 | "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + |
| 192 | SimInfo.regionLocY); | 192 | SimInfo.regionLocY); |
| 193 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); | 193 | response.SimAddress = Util.GetHostFromDNS(SimInfo.serverURI.Split(new char[] { '/', ':' })[3]).ToString(); |
| 194 | response.SimPort = (uint) SimInfo.serverPort; | 194 | response.SimPort = uint.Parse(SimInfo.serverURI.Split(new char[] { '/', ':' })[4]); |
| 195 | response.RegionX = SimInfo.regionLocX; | 195 | response.RegionX = SimInfo.regionLocX; |
| 196 | response.RegionY = SimInfo.regionLocY; | 196 | response.RegionY = SimInfo.regionLocY; |
| 197 | 197 | ||