Melanie cc1fe354d0 Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge ...

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

2011-10-11 21:21:44 +01:00

..

Api

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21:44 +01:00

CodeTools

Optionally, don't delete previously compiled scripts on startup

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

Instance

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Tests

llSetPrimitiveParams Prim type params precision errors

2011-09-09 22:53:45 +01: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