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

Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

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

..

Api

Merge branch 'master' into careminster

2013-01-04 22:39:07 +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

2012-12-18 09:45:40 +00:00

Properties

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

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

Tests

Remove some mono warnings in script tests, chiefly where SetUp() wasn't properly calling to OpenSimTestCase.SetUp()

2012-12-05 23:36:15 +00:00

AssemblyResolver.cs

…

Helpers.cs

Merge branch 'master' into careminster

2012-08-18 13:57:50 +01: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