Justin Clark-Casey (justincc) a133acbd5f Merge branch 'iar-merge' ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs

2010-08-04 20:56:52 +01:00

..

EntityTransfer

Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.

2010-06-13 19:06:22 -07:00

EventQueue

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

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

InterfaceCommander

Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522

2010-02-12 23:13:35 +00:00

InventoryAccess

Revamp the permissions propagation. This MAY mess up. Please test.

2010-07-13 20:45:16 +01:00

Library

Add --merge switch to load iar.

2010-06-30 00:10:44 +01:00

Monitoring

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

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