Melanie 924df14c5e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/VersionInfo.cs

2012-09-07 19:49:46 +01:00

..

Api

Merge branch 'master' into careminster

2012-09-07 19:49:46 +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

fixing bug where last element in list is ignored

2012-08-30 00:10:28 +01:00