Melanie 0a876a305c Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

2012-12-16 21:19:30 +00:00

..

Caps

Merge branch 'master' into careminster

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

EntityTransfer

Merge branch 'master' into careminster

2012-11-13 02:28:40 +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

Merge branch 'master' into careminster

2012-12-16 21:19:30 +00:00

Library

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08: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

UserManagementModule: search the local cache for names too.

2012-12-09 15:31:11 -08:00