Melanie 91b70bf3fe Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

2013-11-08 17:55:01 +00:00

..

Plugins

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00

Properties

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

ApiManager.cs

Add osForceAttachToAvatar() and osForceDetachFromAvatar()

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

AsyncCommandManager.cs

Merge branch 'master' into careminster

2013-06-04 21:09:25 +01:00

CM_Api.cs

Merge branch 'master' into careminster

2013-01-24 00:25:08 +00:00

LS_Api.cs

Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs.

2013-01-23 23:38:08 +00:00

LSL_Api.cs

Merge branch 'master' into careminster

2013-11-08 17:55:01 +00:00

MOD_Api.cs

Merge branch 'master' into careminster

2013-08-07 23:29:42 +01:00

OSSL_Api.cs

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00