OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not display 0:xx:xx PM

master
UbitUmarov 2020-06-12 20:02:55 +01:00
parent e404d671c8
commit 3bf0f6c407
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1607,6 +1607,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
if (h > 12) if (h > 12)
return string.Format("{0}:{1:00}:{2:00} PM", h - 12, m, s); return string.Format("{0}:{1:00}:{2:00} PM", h - 12, m, s);
if (h == 12)
return string.Format("{0}:{1:00}:{2:00} PM", h, m, s);
return string.Format("{0}:{1:00}:{2:00} AM", h, m, s); return string.Format("{0}:{1:00}:{2:00} AM", h, m, s);
} }

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -76,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osSetEstateSunSettings(sunFixed, sunHour); m_OSSL_Functions.osSetEstateSunSettings(sunFixed, sunHour);
} }
public double osGetCurrentSunHour() public LSL_Float osGetCurrentSunHour()
{ {
return m_OSSL_Functions.osGetCurrentSunHour(); return m_OSSL_Functions.osGetCurrentSunHour();
} }