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

Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

2013-06-11 01:03:15 +01:00

..

Plugins

Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.

2013-05-26 14:11:48 +02: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

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-06-11 01:03:15 +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