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

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-07-29 02:08:05 +01:00

..

Api

Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

2013-07-18 10:17:30 +01:00

CodeTools

Make C# scripts return correct error line and column numbers instead of failing because they have no linemap.

2013-03-13 00:19:37 +00:00

Instance

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

Tests

Fix NPC regression test failures.

2013-07-26 18:43:15 +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

JustinCC's core re-merge

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

LSL_Types.cs

Merge branch 'master' into careminster

2013-06-11 21:01:58 +01:00

ScriptException.cs

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

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