Melanie 86d4e45f4d since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param ...

Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-08-25 21:03:47 +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

since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param

2012-08-25 21:03:47 +01:00

MOD_Api.cs

implicit operators mean one does not need to instantiate new objects manually

2012-08-18 18:29:59 +01:00

OSSL_Api.cs

since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param

2012-08-25 21:03:47 +01:00