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

..

Interfaces

Revert "Fix script "Running" behavior"

2012-07-16 23:31:55 +01:00

Shared

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

XEngine

Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster

2012-08-25 18:08:10 +01:00