ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source
This commit is contained in:
Melanie
2012-09-10 13:53:00 +01:00
parent 3e1b6b8d20 657428a439
commit 21c476228a
20 changed files with 401 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -3386,7 +3386,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void llInstantMessage(string user, string message)
{
UUID result;
if (!UUID.TryParse(user, out result))
if (!UUID.TryParse(user, out result) || result == UUID.Zero)
{
ShoutError("An invalid key was passed to llInstantMessage");
ScriptSleep(2000);