Melanie 23d5bafa7f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

2012-10-03 00:24:33 +01:00

..

Caps

Merge branch 'master' into careminster

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

EntityTransfer

Merge branch 'avination' into careminster

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

Add last frame time monitor to MonitorModule now that this value is useful

2012-06-11 23:30:11 +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

Show the user's home url too on the console command.

2012-09-26 11:27:31 -07:00