Melanie bdb5ac96d9 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2011-11-19 22:39:15 +00:00

..

Resources

Add the XML manifests needed to get the new style modules to load.

2009-04-15 23:59:15 +00:00

Tests

Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead

2011-05-21 01:05:20 +01:00

EventManager.cs

Eliminate pointless checks of SOG.RootPart != null

2011-09-01 02:11:00 +01:00

XEngine.cs

Merge branch 'master' into bigmerge

2011-11-19 22:39:15 +00:00

XWorkItem.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00