Melanie d1e681f682 Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

2011-10-11 23:14:23 +01:00

..

Caps

Merge branch 'master' into careminster-presence-refactor

2011-05-08 20:23:06 +01:00

EntityTransfer

Bring us up to date.

2011-09-14 19:11:32 -07: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 commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge

2011-10-11 23:14:23 +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 a warning to URI config in GridCommon.ini.example not to add a slash to the end.

2011-07-12 23:35:06 +01:00

Statistics/Logging

Formatting cleanup.

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

UserManagement

Stop the UserManagementModule logging every user it adds for now

2011-09-10 00:23:52 +01:00