Melanie 339d8ef2a6 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

2013-03-06 00:15:54 +00:00

..

Plugins

Merge branch 'master' into careminster

2013-01-10 01:38:03 +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

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

2013-03-06 00:15:54 +00:00

MOD_Api.cs

Merge branch 'avination' into careminster

2013-03-06 00:15:54 +00:00

OSSL_Api.cs

Merge branch 'avination' into careminster

2013-03-03 13:24:37 +00:00