Melanie Thielker 159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

2014-06-21 00:39:55 +02:00

..

Plugins

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00: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

Following on from 50ea2e0, only fetch scene presence for check if lightscript function has failed initial IsEstateManagerOrOwner() check

2014-01-18 01:36:40 +00:00

LSL_Api.cs

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

MOD_Api.cs

Merge branch 'master' into careminster

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

OSSL_Api.cs

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00