Melanie dcbcbd697f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs

2012-04-27 22:28:09 +01:00

..

Plugins

Merge branch 'master' into careminster

2012-04-27 22:28:09 +01:00

ApiManager.cs

Add osForceAttachToAvatar() and osForceDetachFromAvatar()

2012-04-24 00:03:57 +01:00

AsyncCommandManager.cs

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00

CM_Api.cs

Add the country functions in the careminster API

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

LS_Api.cs

refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.

2012-04-17 01:25:41 +01:00

LSL_Api.cs

Port Avination link order to make OpenSim behave like SL. Make Primstar scripts work. Fixes Mantis #5990

2012-04-25 19:09:22 +01:00

MOD_Api.cs

Add a hust UUID to the script invocations

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

OSSL_Api.cs

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00