diff options
| author | Diva Canto | 2009-09-28 20:58:21 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-28 20:58:21 -0700 |
| commit | 6653a30487d76760451467a22849aba725f1e7cf (patch) | |
| tree | 0881b0b7996c2b2d18c4678ede5f4f393c95ccb2 /OpenSim/Grid | |
| parent | Fixed bug in Check4096 (HG). (diff) | |
| download | opensim-SC-6653a30487d76760451467a22849aba725f1e7cf.zip opensim-SC-6653a30487d76760451467a22849aba725f1e7cf.tar.gz opensim-SC-6653a30487d76760451467a22849aba725f1e7cf.tar.bz2 opensim-SC-6653a30487d76760451467a22849aba725f1e7cf.tar.xz | |
Fixed bug in HG that was causing secondlife:// refs to bomb the client.
Also fiddled a bit more with the initial CAP in the user server.
Diffstat (limited to 'OpenSim/Grid')
| -rw-r--r-- | OpenSim/Grid/UserServer.Modules/UserLoginService.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs index 47bbeca..c95e054 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs | |||
| @@ -279,9 +279,8 @@ namespace OpenSim.Grid.UserServer.Modules | |||
| 279 | //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath); | 279 | //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath); |
| 280 | 280 | ||
| 281 | // Take off trailing / so that the caps path isn't //CAPS/someUUID | 281 | // Take off trailing / so that the caps path isn't //CAPS/someUUID |
| 282 | if (regionInfo.httpServerURI.EndsWith("/")) | 282 | string uri = regionInfo.httpServerURI.Trim(new char[] { '/' }); |
| 283 | regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1); | 283 | response.SeedCapability = uri + CapsUtil.GetCapsSeedPath(capsPath); |
| 284 | response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath); | ||
| 285 | 284 | ||
| 286 | 285 | ||
| 287 | // Notify the target of an incoming user | 286 | // Notify the target of an incoming user |