Melanie 24235006f4 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs

2011-11-04 01:18:37 +00:00

..

Api

Merge branch 'master' into bigmerge

2011-11-04 01:18:37 +00:00

CodeTools

Optionally, don't delete previously compiled scripts on startup

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

Instance

Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge

2011-10-25 03:16:26 +01: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