diff options
author | MW | 2007-03-30 12:12:33 +0000 |
---|---|---|
committer | MW | 2007-03-30 12:12:33 +0000 |
commit | cf182b98970a684ba57eed590db17a039d66158b (patch) | |
tree | c4f80d82c4dcf90febe0886c7c2587597c52e0d7 /OpenSim.RegionServer/AgentAssetUpload.cs | |
parent | Removed a few comments sent to the console (diff) | |
download | opensim-SC-cf182b98970a684ba57eed590db17a039d66158b.zip opensim-SC-cf182b98970a684ba57eed590db17a039d66158b.tar.gz opensim-SC-cf182b98970a684ba57eed590db17a039d66158b.tar.bz2 opensim-SC-cf182b98970a684ba57eed590db17a039d66158b.tar.xz |
Clothing now seems to work (though there are likely to still be some problems)
Diffstat (limited to 'OpenSim.RegionServer/AgentAssetUpload.cs')
-rw-r--r-- | OpenSim.RegionServer/AgentAssetUpload.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs index f6b388d..722da53 100644 --- a/OpenSim.RegionServer/AgentAssetUpload.cs +++ b/OpenSim.RegionServer/AgentAssetUpload.cs | |||
@@ -41,6 +41,7 @@ namespace OpenSim | |||
41 | response.AssetBlock.Success = true; | 41 | response.AssetBlock.Success = true; |
42 | response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID); | 42 | response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID); |
43 | this.ourClient.OutPacket(response); | 43 | this.ourClient.OutPacket(response); |
44 | m_assetCache.AddAsset(asset); | ||
44 | } | 45 | } |
45 | else | 46 | else |
46 | { | 47 | { |
@@ -150,10 +151,11 @@ namespace OpenSim | |||
150 | response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID); | 151 | response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID); |
151 | this.ourClient.OutPacket(response); | 152 | this.ourClient.OutPacket(response); |
152 | 153 | ||
154 | m_assetCache.AddAsset(trans.Asset); | ||
153 | //check if we should add it to inventory | 155 | //check if we should add it to inventory |
154 | if (trans.AddToInventory) | 156 | if (trans.AddToInventory) |
155 | { | 157 | { |
156 | m_assetCache.AddAsset(trans.Asset); | 158 | // m_assetCache.AddAsset(trans.Asset); |
157 | m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); | 159 | m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); |
158 | } | 160 | } |
159 | 161 | ||
@@ -201,7 +203,7 @@ namespace OpenSim | |||
201 | if (trans.UploadComplete) | 203 | if (trans.UploadComplete) |
202 | { | 204 | { |
203 | //already complete so we can add it to the inventory | 205 | //already complete so we can add it to the inventory |
204 | m_assetCache.AddAsset(trans.Asset); | 206 | //m_assetCache.AddAsset(trans.Asset); |
205 | Console.WriteLine( "Item created is " +m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated()); | 207 | Console.WriteLine( "Item created is " +m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated()); |
206 | } | 208 | } |
207 | else | 209 | else |