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

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

2013-02-23 20:37:09 +00:00

..

Caps

Merge branch 'master' into careminster

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

DynamicAttributes

minor: remove some mono compiler warnings

2013-02-14 21:29:35 +00:00

EntityTransfer

Merge branch 'master' into careminster

2013-02-23 20:37:09 +00: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 'master' into careminster

2013-02-23 20:37:09 +00:00

Library

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

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

Monitoring

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

Statistics/Logging

Add flush after write feature to LogWriter

2013-02-20 16:13:49 -08:00

UserManagement

UserManagementModule: search the local cache for names too.

2012-12-09 15:31:11 -08:00