From ec305a48252b01e35a3ef4c2908fd229ccc7077d Mon Sep 17 00:00:00 2001 From: meta7 Date: Mon, 13 Sep 2010 17:43:45 -0700 Subject: [PATCH] LSL compatibility: Don't throw an exception if an invalid key is passed to llInstantMessage, instead shout about it and apply the usual delay. This now matches SL. --- .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a5b3cd0e6b..e299f9627a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -3249,10 +3249,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID result; if (!UUID.TryParse(user, out result)) { - if (!m_debuggerSafe) - { - throw new Exception(String.Format("An invalid key of '{0} was passed to llInstantMessage", user)); - } + ShoutError("An invalid key was passed to llInstantMessage"); + ScriptSleep(2000); return; }