ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8855 fix the cast, avoiding the tostring

Browse Source
This commit is contained in:
UbitUmarov
2021-02-06 18:42:02 +00:00
parent caddb8ac97
commit bb6f31039e
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4268,6 +4268,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_LSL_Api.DetachFromAvatar();
}
private bool listObjToInt(object p, out int i)
{
try
{
if (p is LSL_Integer)
i = (LSL_Integer)p;
else if (p is int)
i = (int)p;
else if (p is uint)
i = (int)(uint)p;
else if (p is string)
return int.TryParse((string)p, out i);
else if (p is LSL_String)
return int.TryParse((string)(LSL_String)p, out i);
else
{
i = 0;
return false;
}
return true;
}
catch
{
i = 0;
return false;
}
}
public LSL_List osGetNumberOfAttachments(LSL_Key avatar, LSL_List attachmentPoints)
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetNumberOfAttachments");
@@ -4278,12 +4306,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
foreach (object point in attachmentPoints.Data)
{
LSL_Integer ipoint = new LSL_Integer(
(point is LSL_Integer || point is int || point is uint) ?
(int)point :
0
);
resp.Add(ipoint);
listObjToInt(point, out int ipoint);
resp.Add(new LSL_Integer(ipoint));
if (ipoint == 0)
{
// indicates zero attachments