diff options
| author | Melanie | 2011-12-20 21:51:43 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-20 21:51:43 +0000 |
| commit | ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5 (patch) | |
| tree | d89152b691685be8b93699fec8ac5d254c01bb53 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Though the viewer warns about receiving this, not sending appears to break ba... (diff) | |
| download | opensim-SC_OLD-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.zip opensim-SC_OLD-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.gz opensim-SC_OLD-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.bz2 opensim-SC_OLD-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 54e1bf7..57fb808 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
| @@ -296,7 +296,7 @@ namespace OpenSim.Framework | |||
| 296 | if (args["start_pos"] != null) | 296 | if (args["start_pos"] != null) |
| 297 | Vector3.TryParse(args["start_pos"].AsString(), out startpos); | 297 | Vector3.TryParse(args["start_pos"].AsString(), out startpos); |
| 298 | 298 | ||
| 299 | m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos); | 299 | //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos); |
| 300 | 300 | ||
| 301 | try | 301 | try |
| 302 | { | 302 | { |
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 1f22136..6d048f4 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -478,7 +478,7 @@ namespace OpenSim.Framework | |||
| 478 | /// <param name="hash"></param> | 478 | /// <param name="hash"></param> |
| 479 | public virtual void Unpack(OSDMap args, IScene scene) | 479 | public virtual void Unpack(OSDMap args, IScene scene) |
| 480 | { | 480 | { |
| 481 | m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data"); | 481 | //m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data"); |
| 482 | 482 | ||
| 483 | if (args.ContainsKey("region_id")) | 483 | if (args.ContainsKey("region_id")) |
| 484 | UUID.TryParse(args["region_id"].AsString(), out RegionID); | 484 | UUID.TryParse(args["region_id"].AsString(), out RegionID); |