Merge branch 'master' into varregion

This commit is contained in:
Robert Adams
2013-10-28 09:30:26 -07:00
22 changed files with 186 additions and 70 deletions

View File

@@ -3325,7 +3325,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
emailModule.SendEmail(m_host.UUID, address, subject, message);
llSleep(EMAIL_PAUSE_TIME);
ScriptSleep(EMAIL_PAUSE_TIME * 1000);
}
public void llGetNextEmail(string address, string subject)