Melanie ed67b698d3 Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster ...

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

2012-03-22 23:05:58 +00:00

..

Api

Fix merge issue from core

2012-03-22 20:48:31 +00:00

CodeTools

Protect the scriptmodulecomms interface.

2012-03-15 13:37:43 -07:00

Instance

Merge branch 'master' into careminster

2012-03-18 20:44:56 +00:00

Tests

Fix llGiveInventory() so that it checks the destination part for AllowInventoryDrop, not the source.

2012-03-22 22:33:37 +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