Melanie 9a5679876e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs

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

..

Caps

Merge branch 'master' into careminster

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

EntityTransfer

Merge branch 'master' into careminster

2012-11-03 15:38:47 +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 mantis #6425

2012-11-11 21:13:14 -08: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

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() method to LogWriter. Also correct line endings to Linux form.

2012-10-02 11:13:45 -07:00

UserManagement

Finally fix build break by allowing UserManagementModule (which constructs a packet directly) to reference OpenSim.Region.ClientStack.LindenUDP.

2012-10-05 02:02:19 +01:00