ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-14 18:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4
opensim/OpenSim/Region/CoreModules/Agent/AssetTransaction
History
Melanie 001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-27 17:29:44 +01:00
..
AgentAssetsTransactions.cs
Merge branch 'avination' into careminster
2012-09-27 17:29:44 +01:00
AssetTransactionModule.cs
Merge branch 'avination' into careminster
2012-09-27 17:29:44 +01:00
AssetXferUploader.cs
Fix very recently introduced race condition where a CreateNewItem outracing an UploadAsset request could throw an exception because m_asset did not yet exist.
2012-09-27 15:28:43 +01:00