diff options
| author | Robert Adams | 2013-10-28 09:30:26 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-10-28 09:30:26 -0700 |
| commit | 2be0347f5044ec723748c53db9290f3cf8bc431a (patch) | |
| tree | b52812ac7fcdcd8a7a985094e14ca3d461a39673 /OpenSim/Region/ScriptEngine | |
| parent | varregion: update PGSQL driver for storing variable terrain size blobs. (diff) | |
| parent | BulletSim: restore collision flags when clear collision cache. (diff) | |
| download | opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.zip opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.gz opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.bz2 opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -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 e03cf17..61017b8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3325,7 +3325,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3325 | } | 3325 | } |
| 3326 | 3326 | ||
| 3327 | emailModule.SendEmail(m_host.UUID, address, subject, message); | 3327 | emailModule.SendEmail(m_host.UUID, address, subject, message); |
| 3328 | llSleep(EMAIL_PAUSE_TIME); | 3328 | ScriptSleep(EMAIL_PAUSE_TIME * 1000); |
| 3329 | } | 3329 | } |
| 3330 | 3330 | ||
| 3331 | public void llGetNextEmail(string address, string subject) | 3331 | public void llGetNextEmail(string address, string subject) |