Melanie 4ce42762ee Merge branch 'master' into careminster ...

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

2012-01-26 00:21:21 +00:00

..

Api

Merge branch 'master' into careminster

2012-01-26 00:21:21 +00:00

CodeTools

Optionally, don't delete previously compiled scripts on startup

2011-06-24 22:07:20 +01:00

Instance

minor: remove mono compiler warning

2011-11-26 01:40:46 +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

Merge Master

2010-09-26 17:56:31 +01: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