Melanie e79fab91db Intermediate commit. Sill errors. ...

Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Services/UserProfilesService/UserProfilesService.cs

2014-01-05 20:12:32 +00:00

..

ExtendedPhysics

BulletSim: add LSL function and plumbing for setting a spring

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

JsonStore

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

Minimodule

One more module converted: MRMModule.

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

ObjectModules

…

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