Robert Adams 6937eec258 Merge branch 'master' into varregion ...

Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2013-12-17 06:18:13 -08: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

Merge branch 'master' into varregion

2013-12-17 06:18:13 -08:00

XEngine

Convert if-blocks to return statements in small functions such as GetStartParameter().

2013-12-14 01:20:24 +00:00