Melanie 66de4a1389 Merge branch 'careminster' into avination ...

Conflicts:
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs

2012-08-14 21:44:25 +01:00

..

Application

Merge branch 'master' into careminster

2012-08-04 03:00:20 +01:00

ClientStack

Merge branch 'careminster' into avination

2012-08-14 02:34:03 +01:00

CoreModules

Merge branch 'careminster' into avination

2012-08-14 02:34:03 +01:00

DataSnapshot

minor: resolve some mono compiler warnings

2012-05-03 01:56:24 +01:00

Framework

Merge branch 'careminster' into avination

2012-08-14 02:34:03 +01:00

OptionalModules

Prevent race conditions when one thread removes an NPC SP before another thread has retreived it after checking whether the NPC exists.

2012-08-14 21:44:06 +01:00

Physics

Merge branch 'careminster' into avination

2012-08-14 02:34:03 +01:00

RegionCombinerModule

Fix issue where RegionCombinerModule was not removing regions from its dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).

2012-07-27 00:28:23 +01:00

ReplaceableModules

…

ScriptEngine

Prevent race conditions when one thread removes an NPC SP before another thread has retreived it after checking whether the NPC exists.

2012-08-14 21:44:06 +01:00

UserStatistics

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00