From 7d6adeedf5c3e329be53eb4b6c7c0ed0cd3ba2ca Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 6 Jun 2016 08:41:08 -0700
Subject: Fixed a merge issue

---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 96e043e..06a8f25 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -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);
             }
         }
 
-- 
cgit v1.1