diff options
author | Diva Canto | 2013-07-21 15:46:00 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-23 14:28:53 -0700 |
commit | 7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931 (patch) | |
tree | 4f7452e9931ab5724da28df381b22975db1e6b51 /OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |
parent | Improve spacing between data and units on console stats display (diff) | |
download | opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.zip opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.gz opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.bz2 opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.xz |
Don't post Link asset types back to the home grid
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index e0c8ea6..460d147 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -185,8 +185,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
185 | } | 185 | } |
186 | } | 186 | } |
187 | 187 | ||
188 | public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel) | 188 | public void UploadInventoryItem(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel) |
189 | { | 189 | { |
190 | if (type == AssetType.Link) | ||
191 | return; | ||
192 | |||
190 | string userAssetServer = string.Empty; | 193 | string userAssetServer = string.Empty; |
191 | if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) | 194 | if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) |
192 | { | 195 | { |
@@ -221,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
221 | { | 224 | { |
222 | UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data); | 225 | UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data); |
223 | 226 | ||
224 | UploadInventoryItem(remoteClient.AgentId, newAssetID, "", 0); | 227 | UploadInventoryItem(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0); |
225 | 228 | ||
226 | return newAssetID; | 229 | return newAssetID; |
227 | } | 230 | } |
@@ -232,7 +235,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
232 | protected override void ExportAsset(UUID agentID, UUID assetID) | 235 | protected override void ExportAsset(UUID agentID, UUID assetID) |
233 | { | 236 | { |
234 | if (!assetID.Equals(UUID.Zero)) | 237 | if (!assetID.Equals(UUID.Zero)) |
235 | UploadInventoryItem(agentID, assetID, "", 0); | 238 | UploadInventoryItem(agentID, AssetType.Unknown, assetID, "", 0); |
236 | else | 239 | else |
237 | m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); | 240 | m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); |
238 | } | 241 | } |