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

Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-02-04 11:48:20 +00:00

..

InternetRelayClientView

Merge branch 'master' into careminster

2012-02-04 11:48:20 +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

UDP/Linden

minor: correct text and usage for "image queues show" reigon console command.

2012-01-24 20:54:35 +00:00