diff options
| author | Diva Canto | 2016-06-06 08:41:08 -0700 |
|---|---|---|
| committer | Diva Canto | 2016-06-06 08:41:08 -0700 |
| commit | 7d6adeedf5c3e329be53eb4b6c7c0ed0cd3ba2ca (patch) | |
| tree | e71cc80869b1c58ab75fed93b3aa90d4ab427c99 /OpenSim | |
| parent | Don't copy assets to foreign asset servers when the objects are being deleted (diff) | |
| download | opensim-SC_OLD-7d6adeedf5c3e329be53eb4b6c7c0ed0cd3ba2ca.zip opensim-SC_OLD-7d6adeedf5c3e329be53eb4b6c7c0ed0cd3ba2ca.tar.gz opensim-SC_OLD-7d6adeedf5c3e329be53eb4b6c7c0ed0cd3ba2ca.tar.bz2 opensim-SC_OLD-7d6adeedf5c3e329be53eb4b6c7c0ed0cd3ba2ca.tar.xz | |
Fixed a merge issue
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
| 218 | 218 | ||
| 219 | private void PostInventoryAsset(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel) | 219 | private void PostInventoryAsset(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel) |
| 220 | { | 220 | { |
| 221 | if (item.AssetType == (int)AssetType.Link) | 221 | if (type == AssetType.Link) |
| 222 | return; | 222 | return; |
| 223 | 223 | ||
| 224 | string userAssetServer = string.Empty; | 224 | string userAssetServer = string.Empty; |
| 225 | if (IsForeignUser(item.Owner, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) | 225 | if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) |
| 226 | { | 226 | { |
| 227 | m_assMapper.Post(item.AssetID, item.Owner, userAssetServer); | 227 | m_assMapper.Post(assetID, avatarID, userAssetServer); |
| 228 | } | 228 | } |
| 229 | } | 229 | } |
| 230 | 230 | ||