Melanie 31736b1aac Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

2011-11-17 19:04:27 +00:00

..

Caps

Merge branch 'master' into bigmerge

2011-10-26 01:27:24 +01:00

EntityTransfer

Merge branch 'master' into bigmerge

2011-11-06 20:54:13 +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

Fix taking or returning locked objects losing permissions for owner

2011-11-12 12:09:28 +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

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

Statistics/Logging

Formatting cleanup.

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

UserManagement

Fix the build break

2011-11-16 00:10:55 +00:00