From f11a97f12d328af8bb39b92fec5cb5780983b66a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 7 Jan 2010 15:53:55 -0800 Subject: * Finished SimulationServiceConnector * Started rerouting calls to UserService. * Compiles. May run. --- OpenSim/Framework/ChildAgentDataUpdate.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 825ab81..b6b7996 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs @@ -274,7 +274,7 @@ namespace OpenSim.Framework get { return m_id; } set { m_id = value; } } - public ulong RegionHandle; + public UUID RegionID; public uint CircuitCode; public UUID SessionID; @@ -321,7 +321,7 @@ namespace OpenSim.Framework OSDMap args = new OSDMap(); args["message_type"] = OSD.FromString("AgentData"); - args["region_handle"] = OSD.FromString(RegionHandle.ToString()); + args["region_id"] = OSD.FromString(RegionID.ToString()); args["circuit_code"] = OSD.FromString(CircuitCode.ToString()); args["agent_uuid"] = OSD.FromUUID(AgentID); args["session_uuid"] = OSD.FromUUID(SessionID); @@ -414,8 +414,8 @@ namespace OpenSim.Framework /// public virtual void Unpack(OSDMap args) { - if (args.ContainsKey("region_handle")) - UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle); + if (args.ContainsKey("region_id")) + UUID.TryParse(args["region_id"].AsString(), out RegionID); if (args["circuit_code"] != null) UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode); @@ -572,7 +572,7 @@ namespace OpenSim.Framework { System.Console.WriteLine("------------ AgentData ------------"); System.Console.WriteLine("UUID: " + AgentID); - System.Console.WriteLine("Region: " + RegionHandle); + System.Console.WriteLine("Region: " + RegionID); System.Console.WriteLine("Position: " + Position); } } -- cgit v1.1