Melanie 6ce93b22d1 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-10-12 19:05:06 +01:00

..

Caps

Merge branch 'master' into careminster

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

EntityTransfer

Merge branch 'master' into careminster

2012-10-12 19:05:06 +01: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 'avination' into careminster

2012-09-27 17:29:44 +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

Output monitor data in response to console command on MainConsole.Instance rather than m_log

2012-10-04 02:17:57 +01: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