Melanie 8b657773e4 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs

2013-03-14 22:34:15 +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-03-14 22:34:15 +00:00

XEngine

Merge branch 'master' into careminster

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