aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormeta72010-09-13 17:43:45 -0700
committermeta72010-09-13 17:43:45 -0700
commitec305a48252b01e35a3ef4c2908fd229ccc7077d (patch)
tree964ffee33046d8da7f7021e5189c7b59657405aa
parentChange the help message to point to copying OpenSimDefaults.ini.example. (diff)
downloadopensim-SC-ec305a48252b01e35a3ef4c2908fd229ccc7077d.zip
opensim-SC-ec305a48252b01e35a3ef4c2908fd229ccc7077d.tar.gz
opensim-SC-ec305a48252b01e35a3ef4c2908fd229ccc7077d.tar.bz2
opensim-SC-ec305a48252b01e35a3ef4c2908fd229ccc7077d.tar.xz
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.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files 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 a5b3cd0..e299f96 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
3249 UUID result; 3249 UUID result;
3250 if (!UUID.TryParse(user, out result)) 3250 if (!UUID.TryParse(user, out result))
3251 { 3251 {
3252 if (!m_debuggerSafe) 3252 ShoutError("An invalid key was passed to llInstantMessage");
3253 { 3253 ScriptSleep(2000);
3254 throw new Exception(String.Format("An invalid key of '{0} was passed to llInstantMessage", user));
3255 }
3256 return; 3254 return;
3257 } 3255 }
3258 3256