From f9a1fd5748a0f33adad3b8b06702f9474dbf6908 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 23 Dec 2011 15:08:13 -0800
Subject: HG: one more adjustment with trailing /s
---
.../CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index 81b65c5..d20c9eb 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -73,7 +73,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
public AssetBase FetchAsset(string url, UUID assetID)
{
- AssetBase asset = m_scene.AssetService.Get(url + "/" + assetID.ToString());
+ if (!url.EndsWith("/") && !url.EndsWith("="))
+ url = url + "/";
+
+ AssetBase asset = m_scene.AssetService.Get(url + assetID.ToString());
if (asset != null)
{
@@ -87,6 +90,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{
if (asset != null)
{
+ if (!url.EndsWith("/") && !url.EndsWith("="))
+ url = url + "/";
+
// See long comment in AssetCache.AddAsset
if (!asset.Temporary || asset.Local)
{
@@ -99,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
Copy(asset, asset1);
try
{
- asset1.ID = url + "/" + asset.ID;
+ asset1.ID = url + asset.ID;
}
catch
{
--
cgit v1.1