diff options
author | Diva Canto | 2010-01-07 15:53:55 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-07 15:53:55 -0800 |
commit | f11a97f12d328af8bb39b92fec5cb5780983b66a (patch) | |
tree | 00f96f853b91e105786b416dd18f2c76e56fd1fd /OpenSim/Framework/ChildAgentDataUpdate.cs | |
parent | Merge branch 'master' into presence-refactor (diff) | |
download | opensim-SC_OLD-f11a97f12d328af8bb39b92fec5cb5780983b66a.zip opensim-SC_OLD-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.gz opensim-SC_OLD-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.bz2 opensim-SC_OLD-f11a97f12d328af8bb39b92fec5cb5780983b66a.tar.xz |
* Finished SimulationServiceConnector
* Started rerouting calls to UserService.
* Compiles. May run.
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 10 |
1 files changed, 5 insertions, 5 deletions
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 | |||
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); |
@@ -414,8 +414,8 @@ namespace OpenSim.Framework | |||
414 | /// <param name="hash"></param> | 414 | /// <param name="hash"></param> |
415 | public virtual void Unpack(OSDMap args) | 415 | public virtual void Unpack(OSDMap args) |
416 | { | 416 | { |
417 | if (args.ContainsKey("region_handle")) | 417 | if (args.ContainsKey("region_id")) |
418 | UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle); | 418 | UUID.TryParse(args["region_id"].AsString(), out RegionID); |
419 | 419 | ||
420 | if (args["circuit_code"] != null) | 420 | if (args["circuit_code"] != null) |
421 | UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode); | 421 | UInt32.TryParse((string)args["circuit_code"].AsString(), out CircuitCode); |
@@ -572,7 +572,7 @@ namespace OpenSim.Framework | |||
572 | { | 572 | { |
573 | System.Console.WriteLine("------------ AgentData ------------"); | 573 | System.Console.WriteLine("------------ AgentData ------------"); |
574 | System.Console.WriteLine("UUID: " + AgentID); | 574 | System.Console.WriteLine("UUID: " + AgentID); |
575 | System.Console.WriteLine("Region: " + RegionHandle); | 575 | System.Console.WriteLine("Region: " + RegionID); |
576 | System.Console.WriteLine("Position: " + Position); | 576 | System.Console.WriteLine("Position: " + Position); |
577 | } | 577 | } |
578 | } | 578 | } |