Melanie 005c69511d Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-08-07 23:29:42 +01:00

..

AssetTransaction

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

IPBan

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

TextureSender

Making the J2KDecoderModule decoder function async. Could this be the cause of sim freeze? -- HandleRequestImage in LLClientView is now sync, which means that it cannot take too long to complete. However, its execution path may end up in J2KDecoderModule.Decode, which is heavy and could stop the packet processing thread while it's at it.

2013-08-03 15:42:25 -07:00

Xfer

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00