diff options
author | Melanie | 2012-09-09 16:30:01 +0200 |
---|---|---|
committer | Melanie | 2012-09-09 16:30:01 +0200 |
commit | 0556bbefdda9643abf4bbba08ab8e3f066501b74 (patch) | |
tree | a02d2e786b1542c5a8597b045941e965a3019f7e /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Merge branch 'ubitwork' into avination (diff) | |
download | opensim-SC-0556bbefdda9643abf4bbba08ab8e3f066501b74.zip opensim-SC-0556bbefdda9643abf4bbba08ab8e3f066501b74.tar.gz opensim-SC-0556bbefdda9643abf4bbba08ab8e3f066501b74.tar.bz2 opensim-SC-0556bbefdda9643abf4bbba08ab8e3f066501b74.tar.xz |
Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM
to UUID.Zero because it ties up XMLRPC handlers needlessly.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index d5e611c..f9b4bfd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3420,7 +3420,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3420 | public void llInstantMessage(string user, string message) | 3420 | public void llInstantMessage(string user, string message) |
3421 | { | 3421 | { |
3422 | UUID result; | 3422 | UUID result; |
3423 | if (!UUID.TryParse(user, out result)) | 3423 | if (!UUID.TryParse(user, out result) || result == UUID.Zero) |
3424 | { | 3424 | { |
3425 | ShoutError("An invalid key was passed to llInstantMessage"); | 3425 | ShoutError("An invalid key was passed to llInstantMessage"); |
3426 | ScriptSleep(2000); | 3426 | ScriptSleep(2000); |