aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authoralondria2008-02-01 15:22:11 +0000
committeralondria2008-02-01 15:22:11 +0000
commit43ecb1b4d2ab230c7a860e291f9fa278c76617a6 (patch)
tree6825901be474e0e710bf14757e26469c096c4893 /OpenSim/Region
parentThanks to Hashbox for a patch to: (diff)
downloadopensim-SC_OLD-43ecb1b4d2ab230c7a860e291f9fa278c76617a6.zip
opensim-SC_OLD-43ecb1b4d2ab230c7a860e291f9fa278c76617a6.tar.gz
opensim-SC_OLD-43ecb1b4d2ab230c7a860e291f9fa278c76617a6.tar.bz2
opensim-SC_OLD-43ecb1b4d2ab230c7a860e291f9fa278c76617a6.tar.xz
Fixed errors being thrown by invalid PSYS_SRC_TARGET_KEY's in llParticleSystem - defaults to source prim (consistent with LL grid).
Should fix mantis 427.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 91cddf1..df049d8 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2254,7 +2254,15 @@ namespace OpenSim.Region.ScriptEngine.Common
2254 break; 2254 break;
2255 2255
2256 case (int)LSL_BaseClass.PSYS_SRC_TARGET_KEY: 2256 case (int)LSL_BaseClass.PSYS_SRC_TARGET_KEY:
2257 prules.Target = new LLUUID(rules.Data[i + 1].ToString()); 2257 LLUUID key = LLUUID.Zero;
2258 if (LLUUID.TryParse(rules.Data[i + 1].ToString(), out key))
2259 {
2260 prules.Target = key;
2261 }
2262 else
2263 {
2264 prules.Target = m_host.UUID;
2265 }
2258 break; 2266 break;
2259 2267
2260 case (int)LSL_BaseClass.PSYS_SRC_OMEGA: 2268 case (int)LSL_BaseClass.PSYS_SRC_OMEGA: