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

..

Interfaces

Update SmartThreadPool to latest version 2.2.3 with a major and minor change.

2013-05-01 19:01:43 +01:00

Shared

Intermediate commit. Sill errors.

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

XEngine

Intermediate commit. Sill errors.

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