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

Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs

2013-02-06 02:22:12 +00:00

..

Plugins

Merge branch 'master' into careminster

2013-01-10 01:38:03 +00:00

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

ApiManager.cs

Add osForceAttachToAvatar() and osForceDetachFromAvatar()

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

AsyncCommandManager.cs

avoid potencial NullReferenceException

2012-11-24 03:39:37 +00: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-02-06 02:22:12 +00:00

MOD_Api.cs

Fix bug where viewers would not see the "Module command functions not enabled" error if these were disabled and a viewer attempted to call one.

2013-02-05 02:09:21 +00:00

OSSL_Api.cs

Merge branch 'master' into careminster

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