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

Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs

2012-06-06 13:07:05 +01:00

..

Api

Merge branch 'master' into careminster

2012-06-06 13:07:05 +01:00

CodeTools

Protect the scriptmodulecomms interface.

2012-03-15 13:37:43 -07:00

Instance

Merge branch 'avination' into careminster

2012-05-17 13:34:47 +01:00

Tests

Add automated TestllBreakLink()

2012-05-08 23:36:23 +01: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

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

LSL_Types.cs

llListSort SL compatibility: When sorting strided list and the list

2012-03-05 11:54:06 +01:00