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

Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2013-06-23 01:59:57 +01:00

..

Caps

Merge branch 'master' into careminster

2013-05-01 21:39:49 +01:00

DynamicAttributes

Add example code to DOExampleModule to pull data from that previously saved by DAExampleModule when instantiating a dynamc object.

2013-03-15 00:49:35 +00:00

EntityTransfer

Merge branch 'master' into careminster

2013-06-23 01:59:57 +01:00

InterfaceCommander

Added option for UUID as command parameters. This lets the command handle the UUID parsing and type checking before the command is executed.

2013-01-31 11:14:43 -08:00

InventoryAccess

Merge branch 'avination-current' into careminster

2013-06-23 01:48:57 +01:00

Library

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

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

Monitoring

minor: Fix mono compiler warning in MonitorModule

2013-03-05 23:59:39 +00:00

Statistics/Logging

For those people collecting and comparing logfiles from servers scattered

2013-03-19 11:40:10 -07:00

UserManagement

Removed the lock entirely

2013-06-11 15:50:12 -07:00