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.avinationmerge
parent
d734c1985c
commit
0556bbefdd
|
@ -137,6 +137,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
|
|||
{
|
||||
UUID toAgentID = new UUID(im.toAgentID);
|
||||
|
||||
if (toAgentID == UUID.Zero)
|
||||
return;
|
||||
|
||||
// Try root avatar only first
|
||||
foreach (Scene scene in m_Scenes)
|
||||
{
|
||||
|
|
|
@ -3420,7 +3420,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);
|
||||
|
|
Loading…
Reference in New Issue