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

Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs

2012-04-11 23:35:27 +01:00

..

ICM_Api.cs

Add the country functions in the careminster API

2011-02-12 20:59:09 +01:00

ILS_Api.cs

Add lsClearWindlightScene() to the lightshare module to remove WL settings

2010-11-03 02:31:43 +00:00

ILSL_Api.cs

Implement llSetPrimitiveParams for physics shape and material. Add

2012-03-13 22:20:12 +01:00

IMOD_Api.cs

Add a hust UUID to the script invocations

2012-03-26 14:19:55 +01:00

IOSSL_Api.cs

Merge branch 'master' into careminster

2012-04-11 23:35:27 +01:00