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

..

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 llTransferLindenDollars

2011-12-01 13:30:10 +01:00

IMOD_Api.cs

Add modSendCommand function (note, this is a new API module, using the API

2009-11-10 01:22:14 +00:00

IOSSL_Api.cs

Merge branch 'master' into careminster

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