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

mantis 8172: fix llList2Json() in case of vector or rotation types

0.9.0-post-fixes
UbitUmarov 2017-05-20 21:29:33 +01:00
parent 49d42ee08a
commit 02a4298b02
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -16794,7 +16794,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case LitJson.JsonType.Boolean: case LitJson.JsonType.Boolean:
return ((bool)elem ? (LSL_String)ScriptBaseClass.JSON_TRUE : (LSL_String)ScriptBaseClass.JSON_FALSE); return ((bool)elem ? (LSL_String)ScriptBaseClass.JSON_TRUE : (LSL_String)ScriptBaseClass.JSON_FALSE);
case LitJson.JsonType.Double: case LitJson.JsonType.Double:
return (new LSL_Float((float)elem)); return (new LSL_Float((double)elem));
case LitJson.JsonType.None: case LitJson.JsonType.None:
return ((LSL_String)ScriptBaseClass.JSON_NULL); return ((LSL_String)ScriptBaseClass.JSON_NULL);
case LitJson.JsonType.String: case LitJson.JsonType.String:
@ -16804,7 +16804,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
string s = LitJson.JsonMapper.ToJson(elem); string s = LitJson.JsonMapper.ToJson(elem);
return (LSL_String)s; return (LSL_String)s;
default: default:
throw new Exception(ScriptBaseClass.JSON_INVALID); throw new Exception(ScriptBaseClass.JSON_INVALID);
} }
} }
@ -16879,9 +16879,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return i.ToString(); return i.ToString();
} }
if (o is LSL_Rotation) if (o is LSL_Rotation)
return ((LSL_Rotation)o).ToString(); {
StringBuilder sb = new StringBuilder(128);
sb.Append("\"");
LSL_Rotation r = (LSL_Rotation)o;
sb.Append(r.ToString());
sb.Append("\"");
return sb.ToString();
}
if (o is LSL_Vector) if (o is LSL_Vector)
return ((LSL_Vector)o).ToString(); {
StringBuilder sb = new StringBuilder(128);
sb.Append("\"");
LSL_Vector v = (LSL_Vector)o;
sb.Append(v.ToString());
sb.Append("\"");
return sb.ToString();
}
if (o is LSL_String || o is string) if (o is LSL_String || o is string)
{ {
string str; string str;