Melanie 86d4e45f4d since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param ...

Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-08-25 21:03:47 +01:00

..

Api

since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param

2012-08-25 21:03:47 +01:00

CodeTools

Add a reference to OpenMetaverseType.dll to compiled script assemblies.

2012-08-18 19:08:38 +01:00

Instance

Merge branch 'master' into careminster

2012-07-19 09:47:51 +01:00

Tests

Disable logging in regression test in OSSL_ApiAttachmentTests

2012-07-10 23:04:44 +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

Merge branch 'master' into careminster

2012-08-18 13:57:50 +01:00

LSL_Types.cs

Merge branch 'master' into careminster

2012-08-18 19:01:05 +01:00