aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2009-01-13 22:27:26 +0000
committerTeravus Ovares2009-01-13 22:27:26 +0000
commitf013b26241a6243a439c13644abee9d31243c922 (patch)
treec93c7f6e1b7a1936d2efa240236432dcdf24c8e2 /OpenSim
parent* Extended TextureSenderTests and modified TestClient.cs with new methods (diff)
downloadopensim-SC_OLD-f013b26241a6243a439c13644abee9d31243c922.zip
opensim-SC_OLD-f013b26241a6243a439c13644abee9d31243c922.tar.gz
opensim-SC_OLD-f013b26241a6243a439c13644abee9d31243c922.tar.bz2
opensim-SC_OLD-f013b26241a6243a439c13644abee9d31243c922.tar.xz
* Fix an invalid seed cap that could be causing issues.
* CapsUtil.GetRandomCapsObjectPath(); contains a / and the regionInfo.httpServerURI contains a / so that makes * response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath); contain two "//" leading to a seed caps path definition like //CAPS/f7ba4238-ec86-4a2b-b3f6-4d9b56070000/, which is wrong
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index a4c8065..267b2a0 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -310,6 +310,10 @@ namespace OpenSim.Grid.UserServer
310 response.RegionY = regionInfo.regionLocY; 310 response.RegionY = regionInfo.regionLocY;
311 311
312 string capsPath = CapsUtil.GetRandomCapsObjectPath(); 312 string capsPath = CapsUtil.GetRandomCapsObjectPath();
313
314 // Take off trailing / so that the caps path isn't //CAPS/someUUID
315 if (regionInfo.httpServerURI.EndsWith("/"))
316 regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1);
313 response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath); 317 response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
314 318
315 // Notify the target of an incoming user 319 // Notify the target of an incoming user