OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HG: one more adjustment with trailing /s

iar_mods
Diva Canto 2011-12-23 15:08:13 -08:00
parent d38b8caf2b
commit f9a1fd5748
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
View File

@ -73,7 +73,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
public AssetBase FetchAsset(string url, UUID assetID) 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) if (asset != null)
{ {
@ -87,6 +90,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{ {
if (asset != null) if (asset != null)
{ {
if (!url.EndsWith("/") && !url.EndsWith("="))
url = url + "/";
// See long comment in AssetCache.AddAsset // See long comment in AssetCache.AddAsset
if (!asset.Temporary || asset.Local) if (!asset.Temporary || asset.Local)
{ {
@ -99,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
Copy(asset, asset1); Copy(asset, asset1);
try try
{ {
asset1.ID = url + "/" + asset.ID; asset1.ID = url + asset.ID;
} }
catch catch
{ {