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

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-03-09 02:39:14 +00:00

..

Api

Merge branch 'master' into careminster

2012-03-09 02:39:14 +00:00

CodeTools

Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()

2012-03-06 02:30:22 +00:00

Instance

Merge branch 'master' into careminster

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

Tests

Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that they're running

2012-03-06 02:21:19 +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

llListSort SL compatibility: When sorting strided list and the list

2012-03-05 11:54:06 +01:00