diff options
| author | Melanie | 2013-07-04 22:32:58 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-04 22:32:58 +0100 |
| commit | 5ddcc25ee9de481c40a26aabc57d77c71225162e (patch) | |
| tree | 298768abaca492365ac1c9786b0d4ce7dae934ab /OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Guard against completely unknown user UUIDs. (diff) | |
| download | opensim-SC-5ddcc25ee9de481c40a26aabc57d77c71225162e.zip opensim-SC-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.gz opensim-SC-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.bz2 opensim-SC-5ddcc25ee9de481c40a26aabc57d77c71225162e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs')
| -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 dfc4419..15d6f7f 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |||
| @@ -424,7 +424,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 424 | // foreign user is visiting, we need to try again after the first fail to the local | 424 | // foreign user is visiting, we need to try again after the first fail to the local |
| 425 | // asset service. | 425 | // asset service. |
| 426 | string assetServerURL = string.Empty; | 426 | string assetServerURL = string.Empty; |
| 427 | if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL)) | 427 | if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL) && !string.IsNullOrEmpty(assetServerURL)) |
| 428 | { | 428 | { |
| 429 | if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("=")) | 429 | if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("=")) |
| 430 | assetServerURL = assetServerURL + "/"; | 430 | assetServerURL = assetServerURL + "/"; |