diff options
| author | Diva Canto | 2013-07-02 13:29:44 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-02 13:29:44 -0700 |
| commit | ccca0059695e0321ae1aa223c9e8b89cc141b58f (patch) | |
| tree | c98e90afa1b931f01729d0b9feccb1dc861def45 /OpenSim/Region/ClientStack/Linden | |
| parent | Update debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and UserUMMAU -> ... (diff) | |
| download | opensim-SC_OLD-ccca0059695e0321ae1aa223c9e8b89cc141b58f.zip opensim-SC_OLD-ccca0059695e0321ae1aa223c9e8b89cc141b58f.tar.gz opensim-SC_OLD-ccca0059695e0321ae1aa223c9e8b89cc141b58f.tar.bz2 opensim-SC_OLD-ccca0059695e0321ae1aa223c9e8b89cc141b58f.tar.xz | |
HG: close a loophole by which if something was wrong with the ServiceURLs it resulted in never ending asset requests
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs index a168bfe..4d0568d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |||
| @@ -421,7 +421,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 421 | // foreign user is visiting, we need to try again after the first fail to the local | 421 | // foreign user is visiting, we need to try again after the first fail to the local |
| 422 | // asset service. | 422 | // asset service. |
| 423 | string assetServerURL = string.Empty; | 423 | string assetServerURL = string.Empty; |
| 424 | if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL)) | 424 | if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL) && !string.IsNullOrEmpty(assetServerURL)) |
| 425 | { | 425 | { |
| 426 | if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("=")) | 426 | if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("=")) |
| 427 | assetServerURL = assetServerURL + "/"; | 427 | assetServerURL = assetServerURL + "/"; |