Melanie 37049180f6 Merge branch 'master' into careminster ...

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

2012-02-07 21:09:04 +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

Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText().

2012-02-07 17:44:37 +00:00

EventManager.cs

Eliminate pointless checks of SOG.RootPart != null

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

XEngine.cs

Merge branch 'master' into careminster

2012-02-07 21:09:04 +00:00

XWorkItem.cs

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

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