Melanie 578174d21c Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2013-02-27 18:05:04 +00:00

..

Interfaces

Use an integer when specifying the XWorkItem wait rather than a TimeSpan to avoid a Windows casting issue in SmartThreadPool for large TimeSpans.

2013-02-12 21:34:12 +00:00

Shared

Merge branch 'master' into careminster

2013-02-27 18:05:04 +00:00

XEngine

Merge branch 'master' into careminster

2013-02-22 01:28:54 +00:00