diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index ba003c5..bc9b174 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |||
@@ -34,7 +34,7 @@ using System.Security.Policy; | |||
34 | using System.Reflection; | 34 | using System.Reflection; |
35 | using System.Globalization; | 35 | using System.Globalization; |
36 | using System.Xml; | 36 | using System.Xml; |
37 | using libsecondlife; | 37 | using OpenMetaverse; |
38 | using log4net; | 38 | using log4net; |
39 | using Nini.Config; | 39 | using Nini.Config; |
40 | using Amib.Threading; | 40 | using Amib.Threading; |
@@ -264,9 +264,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
264 | new LSL_Types.Vector3(vect); | 264 | new LSL_Types.Vector3(vect); |
265 | 265 | ||
266 | int d_linkNum=0; | 266 | int d_linkNum=0; |
267 | LLUUID d_group = LLUUID.Zero; | 267 | UUID d_group = UUID.Zero; |
268 | string d_name = String.Empty; | 268 | string d_name = String.Empty; |
269 | LLUUID d_owner = LLUUID.Zero; | 269 | UUID d_owner = UUID.Zero; |
270 | LSL_Types.Vector3 d_position = | 270 | LSL_Types.Vector3 d_position = |
271 | new LSL_Types.Vector3(); | 271 | new LSL_Types.Vector3(); |
272 | LSL_Types.Quaternion d_rotation = | 272 | LSL_Types.Quaternion d_rotation = |
@@ -285,14 +285,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
285 | 285 | ||
286 | tmp = det.Attributes.GetNamedItem( | 286 | tmp = det.Attributes.GetNamedItem( |
287 | "group").Value; | 287 | "group").Value; |
288 | LLUUID.TryParse(tmp, out d_group); | 288 | UUID.TryParse(tmp, out d_group); |
289 | 289 | ||
290 | d_name = det.Attributes.GetNamedItem( | 290 | d_name = det.Attributes.GetNamedItem( |
291 | "name").Value; | 291 | "name").Value; |
292 | 292 | ||
293 | tmp = det.Attributes.GetNamedItem( | 293 | tmp = det.Attributes.GetNamedItem( |
294 | "owner").Value; | 294 | "owner").Value; |
295 | LLUUID.TryParse(tmp, out d_owner); | 295 | UUID.TryParse(tmp, out d_owner); |
296 | 296 | ||
297 | tmp = det.Attributes.GetNamedItem( | 297 | tmp = det.Attributes.GetNamedItem( |
298 | "position").Value; | 298 | "position").Value; |
@@ -318,8 +318,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
318 | { | 318 | { |
319 | } | 319 | } |
320 | 320 | ||
321 | LLUUID uuid = new LLUUID(); | 321 | UUID uuid = new UUID(); |
322 | LLUUID.TryParse(det.InnerText, | 322 | UUID.TryParse(det.InnerText, |
323 | out uuid); | 323 | out uuid); |
324 | 324 | ||
325 | DetectParams d = new DetectParams(); | 325 | DetectParams d = new DetectParams(); |
@@ -427,10 +427,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
427 | if (itemType == "list") | 427 | if (itemType == "list") |
428 | return ReadList(tag); | 428 | return ReadList(tag); |
429 | 429 | ||
430 | if (itemType == "libsecondlife.LLUUID") | 430 | if (itemType == "libsecondlife.UUID") |
431 | { | 431 | { |
432 | LLUUID val = new LLUUID(); | 432 | UUID val = new UUID(); |
433 | LLUUID.TryParse(tag.InnerText, out val); | 433 | UUID.TryParse(tag.InnerText, out val); |
434 | 434 | ||
435 | return val; | 435 | return val; |
436 | } | 436 | } |