Melanie 09c2cd0d76 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2013-05-24 00:45:08 +01:00

..

Plugins

Merge branch 'master' into careminster

2013-03-14 22:34:15 +00:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

ApiManager.cs

Add osForceAttachToAvatar() and osForceDetachFromAvatar()

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

AsyncCommandManager.cs

Fix bug where outstanding llHTTPRequests for scripts were not being aborted when they were deleted.

2013-04-04 00:36:15 +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-05-24 00:45:08 +01:00

MOD_Api.cs

Merge branch 'master' into careminster

2013-03-08 01:07:05 +00:00

OSSL_Api.cs

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00