ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2011-12-28 09:24:35 +00:00
parent bf4d727cd5 5b52440e61
commit bde004c08e
30 changed files with 3931 additions and 3777 deletions
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)
{
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
{