aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ChildAgentDataUpdate.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs17
1 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 825ab81..fee71f0 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -274,7 +274,7 @@ namespace OpenSim.Framework
274 get { return m_id; } 274 get { return m_id; }
275 set { m_id = value; } 275 set { m_id = value; }
276 } 276 }
277 public ulong RegionHandle; 277 public UUID RegionID;
278 public uint CircuitCode; 278 public uint CircuitCode;
279 public UUID SessionID; 279 public UUID SessionID;
280 280
@@ -321,7 +321,7 @@ namespace OpenSim.Framework
321 OSDMap args = new OSDMap(); 321 OSDMap args = new OSDMap();
322 args["message_type"] = OSD.FromString("AgentData"); 322 args["message_type"] = OSD.FromString("AgentData");
323 323
324 args["region_handle"] = OSD.FromString(RegionHandle.ToString()); 324 args["region_id"] = OSD.FromString(RegionID.ToString());
325 args["circuit_code"] = OSD.FromString(CircuitCode.ToString()); 325 args["circuit_code"] = OSD.FromString(CircuitCode.ToString());
326 args["agent_uuid"] = OSD.FromUUID(AgentID); 326 args["agent_uuid"] = OSD.FromUUID(AgentID);
327 args["session_uuid"] = OSD.FromUUID(SessionID); 327 args["session_uuid"] = OSD.FromUUID(SessionID);
@@ -334,6 +334,7 @@ namespace OpenSim.Framework
334 args["left_axis"] = OSD.FromString(LeftAxis.ToString()); 334 args["left_axis"] = OSD.FromString(LeftAxis.ToString());
335 args["up_axis"] = OSD.FromString(UpAxis.ToString()); 335 args["up_axis"] = OSD.FromString(UpAxis.ToString());
336 336
337
337 args["changed_grid"] = OSD.FromBoolean(ChangedGrid); 338 args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
338 args["far"] = OSD.FromReal(Far); 339 args["far"] = OSD.FromReal(Far);
339 args["aspect"] = OSD.FromReal(Aspect); 340 args["aspect"] = OSD.FromReal(Aspect);
@@ -353,7 +354,7 @@ namespace OpenSim.Framework
353 args["agent_access"] = OSD.FromString(AgentAccess.ToString()); 354 args["agent_access"] = OSD.FromString(AgentAccess.ToString());
354 355
355 args["active_group_id"] = OSD.FromUUID(ActiveGroupID); 356 args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
356 357
357 if ((Groups != null) && (Groups.Length > 0)) 358 if ((Groups != null) && (Groups.Length > 0))
358 { 359 {
359 OSDArray groups = new OSDArray(Groups.Length); 360 OSDArray groups = new OSDArray(Groups.Length);
@@ -378,6 +379,7 @@ namespace OpenSim.Framework
378 // args["agent_textures"] = textures; 379 // args["agent_textures"] = textures;
379 //} 380 //}
380 381
382
381 if ((AgentTextures != null) && (AgentTextures.Length > 0)) 383 if ((AgentTextures != null) && (AgentTextures.Length > 0))
382 args["texture_entry"] = OSD.FromBinary(AgentTextures); 384 args["texture_entry"] = OSD.FromBinary(AgentTextures);
383 385
@@ -393,6 +395,7 @@ namespace OpenSim.Framework
393 args["wearables"] = wears; 395 args["wearables"] = wears;
394 } 396 }
395 397
398
396 if ((Attachments != null) && (Attachments.Length > 0)) 399 if ((Attachments != null) && (Attachments.Length > 0))
397 { 400 {
398 OSDArray attachs = new OSDArray(Attachments.Length); 401 OSDArray attachs = new OSDArray(Attachments.Length);
@@ -401,9 +404,11 @@ namespace OpenSim.Framework
401 args["attachments"] = attachs; 404 args["attachments"] = attachs;
402 } 405 }
403 406
407
404 if ((CallbackURI != null) && (!CallbackURI.Equals(""))) 408 if ((CallbackURI != null) && (!CallbackURI.Equals("")))
405 args["callback_uri"] = OSD.FromString(CallbackURI); 409 args["callback_uri"] = OSD.FromString(CallbackURI);
406 410
411
407 return args; 412 return args;
408 } 413 }
409 414
@@ -414,8 +419,8 @@ namespace OpenSim.Framework
414 /// <param name="hash"></param> 419 /// <param name="hash"></param>
415 public virtual void Unpack(OSDMap args) 420 public virtual void Unpack(OSDMap args)
416 { 421 {
417 if (args.ContainsKey("region_handle")) 422 if (args.ContainsKey("region_id"))
418 UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle); 423 UUID.TryParse(args["region_id"].AsString(), out RegionID);
419 424
420 if (args["circuit_code"] != null) 425 if (args["circuit_code"] != null)
421 UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode); 426 UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode);
@@ -572,7 +577,7 @@ namespace OpenSim.Framework
572 { 577 {
573 System.Console.WriteLine("------------ AgentData ------------"); 578 System.Console.WriteLine("------------ AgentData ------------");
574 System.Console.WriteLine("UUID: " + AgentID); 579 System.Console.WriteLine("UUID: " + AgentID);
575 System.Console.WriteLine("Region: " + RegionHandle); 580 System.Console.WriteLine("Region: " + RegionID);
576 System.Console.WriteLine("Position: " + Position); 581 System.Console.WriteLine("Position: " + Position);
577 } 582 }
578 } 583 }