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

Fixed a merge issue

Browse Source
This commit is contained in:
Diva Canto
2016-06-06 08:41:08 -07:00
parent c4c3163db9
commit 7d6adeedf5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
View File

@@ -218,13 +218,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
private void PostInventoryAsset(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel)
{
if (item.AssetType == (int)AssetType.Link)
if (type == AssetType.Link)
return;
string userAssetServer = string.Empty;
if (IsForeignUser(item.Owner, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission)
if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission)
{
m_assMapper.Post(item.AssetID, item.Owner, userAssetServer);
m_assMapper.Post(assetID, avatarID, userAssetServer);
}
}