Melanie 05cf51cbbd Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs

2012-06-29 22:11:49 +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

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 'avination' into careminster

2012-06-29 22:11:49 +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-06-14 00:10:52 +01:00