Melanie 64393a7ca8 Merge branch 'master' into careminster ...

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

2012-07-13 02:27:16 +01:00

..

Api

Merge branch 'master' into careminster

2012-07-13 02:27:16 +01:00

CodeTools

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00

Instance

Merge branch 'master' into careminster

2012-07-13 02:27:16 +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

Return NPC instead of AGENT in the detect parameters for touch, collision and

2012-06-28 20:29:37 +02:00

LSL_Types.cs

llListSort SL compatibility: When sorting strided list and the list

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