diff options
| author | Kitto Flora | 2010-11-11 04:51:05 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-11-11 04:51:05 +0000 |
| commit | b2aeea66e36593ccab973240bab43724f577165b (patch) | |
| tree | 4b7bed905081a7678411f251af260e14261cc545 /OpenSim/Framework/ChildAgentDataUpdate.cs | |
| parent | Fix excessive forward motion and flailing while descending a slope, prevent a... (diff) | |
| parent | Prevent teleporting to a region when the egent is banned in all parcels (diff) | |
| download | opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.zip opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.gz opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.bz2 opensim-SC-b2aeea66e36593ccab973240bab43724f577165b.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
| -rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index ddfaaed..a227338 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -333,7 +333,7 @@ namespace OpenSim.Framework | |||
| 333 | { | 333 | { |
| 334 | // DEBUG ON | 334 | // DEBUG ON |
| 335 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] Pack data"); | 335 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] Pack data"); |
| 336 | // DEBUG OFF | 336 | // DEBUG OFF |
| 337 | 337 | ||
| 338 | OSDMap args = new OSDMap(); | 338 | OSDMap args = new OSDMap(); |
| 339 | args["message_type"] = OSD.FromString("AgentData"); | 339 | args["message_type"] = OSD.FromString("AgentData"); |
| @@ -456,7 +456,7 @@ namespace OpenSim.Framework | |||
| 456 | { | 456 | { |
| 457 | // DEBUG ON | 457 | // DEBUG ON |
| 458 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] Unpack data"); | 458 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] Unpack data"); |
| 459 | // DEBUG OFF | 459 | // DEBUG OFF |
| 460 | 460 | ||
| 461 | if (args.ContainsKey("region_id")) | 461 | if (args.ContainsKey("region_id")) |
| 462 | UUID.TryParse(args["region_id"].AsString(), out RegionID); | 462 | UUID.TryParse(args["region_id"].AsString(), out RegionID); |
| @@ -616,7 +616,7 @@ namespace OpenSim.Framework | |||
| 616 | // DEBUG ON | 616 | // DEBUG ON |
| 617 | else | 617 | else |
| 618 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance"); | 618 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance"); |
| 619 | // DEBUG OFF | 619 | // DEBUG OFF |
| 620 | 620 | ||
| 621 | if ((args["controllers"] != null) && (args["controllers"]).Type == OSDType.Array) | 621 | if ((args["controllers"] != null) && (args["controllers"]).Type == OSDType.Array) |
| 622 | { | 622 | { |