Melanie be4c8c4931 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2013-01-24 00:25:08 +00:00

..

Properties

Added AssemblyInfos to every dll in the OpenSim.Region namespace.

2012-11-14 11:09:43 -08:00

Tests

If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then continue to generate C# that is functionality identical to historical generation

2013-01-23 02:36:43 +00:00

ScriptInstance.cs

Merge branch 'master' into careminster

2013-01-24 00:25:08 +00:00

ScriptSerializer.cs

Revert "Fix script "Running" behavior"

2012-07-16 23:31:55 +01:00