diff options
author | UbitUmarov | 2018-07-27 14:20:59 +0100 |
---|---|---|
committer | UbitUmarov | 2018-07-27 14:20:59 +0100 |
commit | a6d5da3e7f6ca518d401791a229fd0bc80b7b29c (patch) | |
tree | 68014d729722133921863205b3782b1cd110a38b | |
parent | make BanLineSafeHeight option visible in OpenSimDefaults.ini (diff) | |
download | opensim-SC-a6d5da3e7f6ca518d401791a229fd0bc80b7b29c.zip opensim-SC-a6d5da3e7f6ca518d401791a229fd0bc80b7b29c.tar.gz opensim-SC-a6d5da3e7f6ca518d401791a229fd0bc80b7b29c.tar.bz2 opensim-SC-a6d5da3e7f6ca518d401791a229fd0bc80b7b29c.tar.xz |
mantis 8346: fix argument of osUnixTimeToTimestamp
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 781f1c9..505d4e5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -3839,7 +3839,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3839 | /// </summary> | 3839 | /// </summary> |
3840 | /// <param name="unixTime"></param> | 3840 | /// <param name="unixTime"></param> |
3841 | /// <returns></returns> | 3841 | /// <returns></returns> |
3842 | public LSL_String osUnixTimeToTimestamp(long time) | 3842 | public LSL_String osUnixTimeToTimestamp(LSL_Integer time) |
3843 | { | 3843 | { |
3844 | CheckThreatLevel(ThreatLevel.VeryLow, "osUnixTimeToTimestamp"); | 3844 | CheckThreatLevel(ThreatLevel.VeryLow, "osUnixTimeToTimestamp"); |
3845 | 3845 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 4c12bd9..5ed628f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -398,7 +398,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
398 | LSL_List osGetAvatarList(); | 398 | LSL_List osGetAvatarList(); |
399 | LSL_List osGetNPCList(); | 399 | LSL_List osGetNPCList(); |
400 | 400 | ||
401 | LSL_String osUnixTimeToTimestamp(long time); | 401 | LSL_String osUnixTimeToTimestamp(LSL_Integer time); |
402 | 402 | ||
403 | LSL_String osGetInventoryDesc(string item); | 403 | LSL_String osGetInventoryDesc(string item); |
404 | 404 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index dd0fa6e..5cf2cdb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -1051,7 +1051,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1051 | return m_OSSL_Functions.osGetNPCList(); | 1051 | return m_OSSL_Functions.osGetNPCList(); |
1052 | } | 1052 | } |
1053 | 1053 | ||
1054 | public LSL_String osUnixTimeToTimestamp(long time) | 1054 | public LSL_String osUnixTimeToTimestamp(LSL_Integer time) |
1055 | { | 1055 | { |
1056 | return m_OSSL_Functions.osUnixTimeToTimestamp(time); | 1056 | return m_OSSL_Functions.osUnixTimeToTimestamp(time); |
1057 | } | 1057 | } |