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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-06-07 23:33:40 +01:00

..

Caps

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00

EntityTransfer

Reverse the logic of a conditional. Clears up a merge artefact.

2012-06-06 20:35:37 +02:00

InterfaceCommander

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

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

InventoryAccess

Merge branch 'master' into careminster

2012-06-07 23:33:40 +01:00

Library

For default everyone permissions on library items, make notecards and scripts non-modifiable (but still copyable, etc).

2011-07-23 02:18:23 +01:00

Monitoring

Add an optional mechanism for physics modules to collect and return arbitrary stats.

2012-05-31 01:52:26 +01:00

Statistics/Logging

Formatting cleanup.

2010-09-12 13:43:49 -04:00

UserManagement

Add "friends show cache <first-name> <last-name>" command for debugging purposes.

2012-03-28 02:51:34 +01:00