diff options
author | Melanie | 2012-08-25 21:03:47 +0100 |
---|---|---|
committer | Melanie | 2012-08-25 21:03:47 +0100 |
commit | 86d4e45f4d5ce7de4a2043dfe753f620925e28c4 (patch) | |
tree | 7d4bb503a2afb9bf3b1c1b6d6eb7e2aed5225943 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
parent | Also move the other avatar based overload out of harms way (diff) | |
download | opensim-SC_OLD-86d4e45f4d5ce7de4a2043dfe753f620925e28c4.zip opensim-SC_OLD-86d4e45f4d5ce7de4a2043dfe753f620925e28c4.tar.gz opensim-SC_OLD-86d4e45f4d5ce7de4a2043dfe753f620925e28c4.tar.bz2 opensim-SC_OLD-86d4e45f4d5ce7de4a2043dfe753f620925e28c4.tar.xz |
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
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 7b71a24..efd1f39 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2261,7 +2261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2261 | List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber); | 2261 | List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber); |
2262 | foreach (SceneObjectPart part in parts) | 2262 | foreach (SceneObjectPart part in parts) |
2263 | { | 2263 | { |
2264 | retVal += ((LSL_Api)m_LSL_Api).GetPrimParams(part, rules); | 2264 | ((LSL_Api)m_LSL_Api).GetPrimParams(part, rules, ref retVal); |
2265 | } | 2265 | } |
2266 | return retVal; | 2266 | return retVal; |
2267 | } | 2267 | } |