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

Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs

2014-01-28 21:02:20 +00:00

..

ExtendedPhysics

BulletSim: add LSL function and plumbing for setting a spring

2013-09-11 09:12:19 -07:00

JsonStore

Clean up orphaned json stores. This can happen when an object is

2014-01-20 11:33:49 -08:00

Minimodule

One more module converted: MRMModule.

2012-11-11 16:18:47 -08:00

ObjectModules

Add copyright headers.

2009-03-07 02:11:50 +00:00

RegionReadyModule

After previous discussion, put eye-catcher 'SCRIPT READY' messages to console rather than log as warning

2013-12-14 01:34:28 +00:00

XmlRpcRouterModule

Merge branch 'master' into careminster

2013-01-02 11:52:37 +00:00