aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authordiva2009-05-26 02:24:38 +0000
committerdiva2009-05-26 02:24:38 +0000
commit49804f67dc270d8b73104253f200c488fa389a17 (patch)
tree47f8b3161e0794417332a1eb14ee3f2c136db521 /OpenSim/Grid
parentRevert a change I made to get a better URL because it failes under mono (diff)
downloadopensim-SC_OLD-49804f67dc270d8b73104253f200c488fa389a17.zip
opensim-SC_OLD-49804f67dc270d8b73104253f200c488fa389a17.tar.gz
opensim-SC_OLD-49804f67dc270d8b73104253f200c488fa389a17.tar.bz2
opensim-SC_OLD-49804f67dc270d8b73104253f200c488fa389a17.tar.xz
Restoring the initial CAP Url to exactly what it used to be before Adam's changes. Adam's code is still there, but commented, until we figure out what's going on.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs19
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index e7f556e..c5701ef 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -270,13 +270,20 @@ namespace OpenSim.Grid.UserServer.Modules
270 270
271 string capsPath = CapsUtil.GetRandomCapsObjectPath(); 271 string capsPath = CapsUtil.GetRandomCapsObjectPath();
272 272
273 // For NAT 273 // Adam's working code commented for now -- Diva 5/25/2009
274 //string host = NetworkUtil.GetHostFor(remoteClient.Address, regionInfo.ServerIP); 274 //// For NAT
275 string host = response.SimAddress; 275 ////string host = NetworkUtil.GetHostFor(remoteClient.Address, regionInfo.ServerIP);
276 // TODO: This doesnt support SSL. -Adam 276 //string host = response.SimAddress;
277 string serverURI = "http://" + host + ":" + regionInfo.ServerPort; 277 //// TODO: This doesnt support SSL. -Adam
278 //string serverURI = "http://" + host + ":" + regionInfo.ServerPort;
279
280 //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
281
282 // Take off trailing / so that the caps path isn't //CAPS/someUUID
283 if (regionInfo.httpServerURI.EndsWith("/"))
284 regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1);
285 response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
278 286
279 response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
280 287
281 // Notify the target of an incoming user 288 // Notify the target of an incoming user
282 m_log.InfoFormat( 289 m_log.InfoFormat(