Melanie 36d744e2a5 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2012-07-19 09:47:51 +01:00

..

Resources

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

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

Tests

Allow XEngine StartDelay to be configured in the [XEngine] config section.

2012-07-11 21:55:18 +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 careminster

2012-07-19 09:47:51 +01:00

XWorkItem.cs

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

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