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

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

2012-10-07 02:48:28 +01:00

..

Plugins

Merge branch 'master' into careminster

2012-08-18 19:01:05 +01:00

ApiManager.cs

Add osForceAttachToAvatar() and osForceDetachFromAvatar()

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

AsyncCommandManager.cs

Merge branch 'master' into careminster

2012-07-28 00:39:36 +01:00

CM_Api.cs

Merge branch 'master' into careminster

2012-05-09 00:43:33 +01:00

LS_Api.cs

refactoring for Vector3 operator & constructor tweaks

2012-08-18 13:21:55 +01:00

LSL_Api.cs

Merge branch 'master' into careminster

2012-10-07 02:48:28 +01:00

MOD_Api.cs

passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly error messages

2012-09-10 13:15:32 +01:00

OSSL_Api.cs

Merge branch 'master' into careminster

2012-10-03 00:24:33 +01:00