Melanie 6137f37028 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-06-29 22:24:53 +01:00

..

Api

Merge branch 'master' into careminster

2012-06-29 22:24:53 +01:00

CodeTools

Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where these aren't evaluated propertly."

2012-06-11 23:30:58 +01:00

Instance

Merge branch 'master' into careminster

2012-06-26 17:35:55 +01:00

Tests

Add automated TestllBreakLink()

2012-05-08 23:36:23 +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