Melanie e8cd9fbbb7 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-06-07 23:33:40 +01:00

..

AssetTransaction

Merge branch 'master' into careminster

2012-06-07 23:33:40 +01:00

IPBan

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

TextureSender

Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure

2012-01-05 22:54:33 +00:00

Xfer

One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.

2010-12-24 08:50:00 -08:00