Melanie 206bfe0657 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs

2013-01-16 17:05:37 +00:00

..

Api

Merge branch 'avination' into careminster

2013-01-16 15:50:34 +00:00

CodeTools

Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests

2012-11-24 03:15:24 +00:00

Instance

Merge branch 'master' into careminster

2013-01-16 17:05:37 +00:00

Properties

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

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

Tests

JustinCC's core re-merge

2013-01-16 15:47:55 +00:00

AssemblyResolver.cs

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

Helpers.cs

JustinCC's core re-merge

2013-01-16 15:47:55 +00:00

LSL_Types.cs

Merge branch 'master' into careminster

2013-01-04 22:39:07 +00:00

ScriptException.cs

Also add the additional ScriptException constructor necessary to get [Serializable] to work.

2012-10-31 00:56:41 +00:00