Melanie 7c888f6af1 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs

2012-02-09 00:19:37 +00:00

..

Api

Push more NPC stuff into threads

2012-02-08 13:04:23 +01:00

CodeTools

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

Instance

Merge branch 'master' into careminster

2012-02-09 00:19:37 +00:00

Tests

Add missing assert to confirm owner delete succeeded to the end of TestOsNpcRemoveOwned()

2012-01-12 23:46:43 +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

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

LSL_Types.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00