diff options
| author | Melanie | 2012-09-10 13:53:00 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-10 13:53:00 +0100 |
| commit | 21c476228a1dbeef1f180a16e9ebb47c8b3fa185 (patch) | |
| tree | 5a2fc5d269eb4711fa2ace11d04731e7dc08607b /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove commented code (diff) | |
| download | opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.zip opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.gz opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.bz2 opensim-SC-21c476228a1dbeef1f180a16e9ebb47c8b3fa185.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -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 1969492..9570669 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3386,7 +3386,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3386 | public void llInstantMessage(string user, string message) | 3386 | public void llInstantMessage(string user, string message) |
| 3387 | { | 3387 | { |
| 3388 | UUID result; | 3388 | UUID result; |
| 3389 | if (!UUID.TryParse(user, out result)) | 3389 | if (!UUID.TryParse(user, out result) || result == UUID.Zero) |
| 3390 | { | 3390 | { |
| 3391 | ShoutError("An invalid key was passed to llInstantMessage"); | 3391 | ShoutError("An invalid key was passed to llInstantMessage"); |
| 3392 | ScriptSleep(2000); | 3392 | ScriptSleep(2000); |