diff options
| author | Melanie | 2010-11-17 18:21:35 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-17 18:21:35 +0000 |
| commit | 3bc9c1adb4b4ed9d372e40d5cbd9d257b73c8816 (patch) | |
| tree | 2c25eecf06d4dae3045b6ce5c66719ef15a27517 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Fix gesture and viewer preview sounds not playing (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-3bc9c1adb4b4ed9d372e40d5cbd9d257b73c8816.zip opensim-SC-3bc9c1adb4b4ed9d372e40d5cbd9d257b73c8816.tar.gz opensim-SC-3bc9c1adb4b4ed9d372e40d5cbd9d257b73c8816.tar.bz2 opensim-SC-3bc9c1adb4b4ed9d372e40d5cbd9d257b73c8816.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 028bb42..961987d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -184,5 +184,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 184 | 184 | ||
| 185 | LSL_List osGetAvatarList(); | 185 | LSL_List osGetAvatarList(); |
| 186 | 186 | ||
| 187 | LSL_String osUnixTimeToTimestamp(long time); | ||
| 187 | } | 188 | } |
| 188 | } | 189 | } |