diff options
| author | Melanie | 2010-11-23 23:48:52 +0100 |
|---|---|---|
| committer | Melanie | 2010-11-23 23:48:52 +0100 |
| commit | a47fb93b7419c08549b27dc0d5c27896ecf744c7 (patch) | |
| tree | 40733de291d22766120288a72c5d71e0eb6efae7 /OpenSim | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-a47fb93b7419c08549b27dc0d5c27896ecf744c7.zip opensim-SC_OLD-a47fb93b7419c08549b27dc0d5c27896ecf744c7.tar.gz opensim-SC_OLD-a47fb93b7419c08549b27dc0d5c27896ecf744c7.tar.bz2 opensim-SC_OLD-a47fb93b7419c08549b27dc0d5c27896ecf744c7.tar.xz | |
Prevent a dump in the llGetLinkKey method when using LINK_ROOT in a single prim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7e9224d..ec4d815 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4007,6 +4007,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4007 | { | 4007 | { |
| 4008 | linknum -= (m_host.ParentGroup.PrimCount) + 1; | 4008 | linknum -= (m_host.ParentGroup.PrimCount) + 1; |
| 4009 | 4009 | ||
| 4010 | if (linknum < 0) | ||
| 4011 | return UUID.Zero.ToString(); | ||
| 4012 | |||
| 4010 | List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET); | 4013 | List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET); |
| 4011 | if (avatars.Count > linknum) | 4014 | if (avatars.Count > linknum) |
| 4012 | { | 4015 | { |