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

Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

2012-10-31 21:42:06 +00:00

..

Api

Merge branch 'master' into careminster

2012-10-30 01:02:20 +00: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

Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if appearance notecard does not exist, rather than returning UUID.Zero or silently failing.

2012-10-25 03:02:00 +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

ScriptException.cs

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

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