Robert Adams fd045d520e Merge branch 'master' into varregion ...

Conflicts:
	OpenSim/Framework/Constants.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Services/GridService/GridService.cs
	OpenSim/Services/Interfaces/IGridService.cs
Most conflicts had to do with Util routines not in master branch yet.

2014-01-04 08:57:51 -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

2014-01-04 08:57:51 -08:00

XEngine

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

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