Melanie f39e4abf0e Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs

2013-03-03 13:24:37 +00:00

..

AgentAssetsTransactions.cs

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +01:00

AssetTransactionModule.cs

Merge branch 'master' into careminster

2013-02-15 21:42:16 +00:00

AssetXferUploader.cs

Reinstate uploading temporary textures

2013-02-27 18:43:51 +01:00