diff options
author | Diva Canto | 2014-07-04 15:56:09 -0700 |
---|---|---|
committer | Diva Canto | 2014-07-04 15:56:09 -0700 |
commit | 78c155cd129824dfb651127f37786404a5ecfed6 (patch) | |
tree | e3af9130f0416ea5ce962253cf1e4c50bf652ea5 /OpenSim/Region/CoreModules/Framework | |
parent | On logout, delay the removal of AgentCircuitData until the very end, because ... (diff) | |
download | opensim-SC_OLD-78c155cd129824dfb651127f37786404a5ecfed6.zip opensim-SC_OLD-78c155cd129824dfb651127f37786404a5ecfed6.tar.gz opensim-SC_OLD-78c155cd129824dfb651127f37786404a5ecfed6.tar.bz2 opensim-SC_OLD-78c155cd129824dfb651127f37786404a5ecfed6.tar.xz |
Instrument the UDP path of creating assets so that it triggers an asset post for users with different asset servers
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 5e831cc..582b267 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
130 | 130 | ||
131 | base.AddRegion(scene); | 131 | base.AddRegion(scene); |
132 | m_assMapper = new HGAssetMapper(scene, m_HomeURI); | 132 | m_assMapper = new HGAssetMapper(scene, m_HomeURI); |
133 | scene.EventManager.OnNewInventoryItemUploadComplete += UploadInventoryItem; | 133 | scene.EventManager.OnNewInventoryItemUploadComplete += PostInventoryAsset; |
134 | scene.EventManager.OnTeleportStart += TeleportStart; | 134 | scene.EventManager.OnTeleportStart += TeleportStart; |
135 | scene.EventManager.OnTeleportFail += TeleportFail; | 135 | scene.EventManager.OnTeleportFail += TeleportFail; |
136 | 136 | ||
@@ -209,7 +209,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
209 | } | 209 | } |
210 | } | 210 | } |
211 | 211 | ||
212 | public void UploadInventoryItem(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel) | 212 | public void PostInventoryAsset(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel) |
213 | { | 213 | { |
214 | if (type == AssetType.Link) | 214 | if (type == AssetType.Link) |
215 | return; | 215 | return; |
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
248 | { | 248 | { |
249 | UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data); | 249 | UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data); |
250 | 250 | ||
251 | UploadInventoryItem(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0); | 251 | PostInventoryAsset(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0); |
252 | 252 | ||
253 | return newAssetID; | 253 | return newAssetID; |
254 | } | 254 | } |
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
260 | { | 260 | { |
261 | if (base.UpdateInventoryItemAsset(ownerID, item, asset)) | 261 | if (base.UpdateInventoryItemAsset(ownerID, item, asset)) |
262 | { | 262 | { |
263 | UploadInventoryItem(ownerID, (AssetType)asset.Type, asset.FullID, asset.Name, 0); | 263 | PostInventoryAsset(ownerID, (AssetType)asset.Type, asset.FullID, asset.Name, 0); |
264 | return true; | 264 | return true; |
265 | } | 265 | } |
266 | 266 | ||
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
273 | protected override void ExportAsset(UUID agentID, UUID assetID) | 273 | protected override void ExportAsset(UUID agentID, UUID assetID) |
274 | { | 274 | { |
275 | if (!assetID.Equals(UUID.Zero)) | 275 | if (!assetID.Equals(UUID.Zero)) |
276 | UploadInventoryItem(agentID, AssetType.Unknown, assetID, "", 0); | 276 | PostInventoryAsset(agentID, AssetType.Unknown, assetID, "", 0); |
277 | else | 277 | else |
278 | m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); | 278 | m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); |
279 | } | 279 | } |