Melanie 7b9c4d2826 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-07-16 21:32:10 +01:00

..

Plugins

Merge branch 'master' into careminster

2012-07-12 08:55:16 +01:00

ApiManager.cs

Add osForceAttachToAvatar() and osForceDetachFromAvatar()

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

AsyncCommandManager.cs

Merge branch 'master' into careminster

2012-07-12 08:55:16 +01:00

CM_Api.cs

Merge branch 'master' into careminster

2012-05-09 00:43:33 +01:00

LS_Api.cs

refactor: Eliminate local id parameter from api initialize.

2012-05-08 23:20:27 +01:00

LSL_Api.cs

Merge branch 'master' into careminster

2012-07-16 21:32:10 +01:00

MOD_Api.cs

refactor: Eliminate local id parameter from api initialize.

2012-05-08 23:20:27 +01:00

OSSL_Api.cs

Merge branch 'master' into careminster

2012-07-13 02:27:16 +01:00