Melanie 648e258b8e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs

2013-06-04 21:09:25 +01:00

..

Api

Merge branch 'master' into careminster

2013-06-04 21:09:25 +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-05-01 21:39:49 +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

minor: Remove mono compiler warnings from LSL_ApiHttpTests

2013-03-11 23:01:07 +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-05-16 21:59:14 +01:00

ScriptException.cs

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

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