Melanie 52a4dbccbe Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2011-12-12 11:42:22 +00:00

..

Api

Merge branch 'master' into careminster

2011-12-12 11:42:22 +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

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