diff options
| author | lbsa71 | 2007-07-01 16:07:41 +0000 |
|---|---|---|
| committer | lbsa71 | 2007-07-01 16:07:41 +0000 |
| commit | 06a8c132005b4ab804f25d54c0c0f899fc98e3a1 (patch) | |
| tree | 2210d9426050c11035453631735fb1f324a070a7 /OpenSim/Region/Communications/Local/LocalUserServices.cs | |
| parent | Fixed SimpleApp - aka thankgoditssundaycommit (diff) | |
| download | opensim-SC-06a8c132005b4ab804f25d54c0c0f899fc98e3a1.zip opensim-SC-06a8c132005b4ab804f25d54c0c0f899fc98e3a1.tar.gz opensim-SC-06a8c132005b4ab804f25d54c0c0f899fc98e3a1.tar.bz2 opensim-SC-06a8c132005b4ab804f25d54c0c0f899fc98e3a1.tar.xz | |
MAJOR IP RESTRUCTURING
* moving towards IPEndPoints all over the place
* trying to make the internal/external division
Diffstat (limited to 'OpenSim/Region/Communications/Local/LocalUserServices.cs')
| -rw-r--r-- | OpenSim/Region/Communications/Local/LocalUserServices.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 5a2a5c8..db9d9b9 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
| @@ -88,11 +88,11 @@ namespace OpenSim.Region.Communications.Local | |||
| 88 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + | 88 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + |
| 89 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; | 89 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; |
| 90 | string capsPath = Util.GetRandomCapsPath(); | 90 | string capsPath = Util.GetRandomCapsPath(); |
| 91 | response.SimAddress = reg.CommsExternalAddress; | 91 | response.SimAddress = reg.ExternalEndPoint.Address.ToString(); |
| 92 | response.SimPort = (Int32)reg.CommsIPListenPort; | 92 | response.SimPort = (Int32)reg.ExternalEndPoint.Port; |
| 93 | response.RegionX = reg.RegionLocX ; | 93 | response.RegionX = reg.RegionLocX ; |
| 94 | response.RegionY = reg.RegionLocY ; | 94 | response.RegionY = reg.RegionLocY ; |
| 95 | response.SeedCapability = "http://" + reg.CommsIPListenAddr + ":" + "9000" + "/CAPS/" + capsPath + "0000/"; | 95 | response.SeedCapability = "http://" + reg.ExternalHostName + ":" + reg.ExternalEndPoint.Port.ToString() + "/CAPS/" + capsPath + "0000/"; |
| 96 | theUser.currentAgent.currentRegion = reg.SimUUID; | 96 | theUser.currentAgent.currentRegion = reg.SimUUID; |
| 97 | theUser.currentAgent.currentHandle = reg.RegionHandle; | 97 | theUser.currentAgent.currentHandle = reg.RegionHandle; |
| 98 | 98 | ||