Melanie c0f70d17fc Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2012-03-14 11:33:51 +00:00

..

Caps

Merge branch 'master' into careminster

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

EntityTransfer

Merge branch 'master' into careminster

2012-03-14 11:33:51 +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

More on HG inventory transfers. Move the FireAndForget higher up.

2012-03-09 09:48:12 -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

Change "help" to display categories/module list then "help <category/module>" to display commands in a category.

2012-03-08 01:51:37 +00:00

Statistics/Logging

Formatting cleanup.

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

UserManagement

Change "help" to display categories/module list then "help <category/module>" to display commands in a category.

2012-03-08 01:51:37 +00:00