diff options
| author | Melanie | 2009-12-20 16:45:28 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-20 16:45:28 +0000 |
| commit | 3d3e0ea4f38b343edc19b7530fbac28b84b53ecf (patch) | |
| tree | b22a6e71dca45c15f98df996182239186259b6d3 /OpenSim/Services/Connectors | |
| parent | Merge branch 'casper' (diff) | |
| parent | Fix a case where an idle sim can eat 100% of a core (diff) | |
| download | opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.zip opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.gz opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.bz2 opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs index 2f33bab..968a6d6 100644 --- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | |||
| @@ -92,12 +92,12 @@ namespace OpenSim.Services.Connectors.Grid | |||
| 92 | try | 92 | try |
| 93 | { | 93 | { |
| 94 | UUID.TryParse((string)hash["uuid"], out uuid); | 94 | UUID.TryParse((string)hash["uuid"], out uuid); |
| 95 | m_log.Debug(">> HERE, uuid: " + uuid); | 95 | //m_log.Debug(">> HERE, uuid: " + uuid); |
| 96 | info.RegionID = uuid; | 96 | info.RegionID = uuid; |
| 97 | if ((string)hash["handle"] != null) | 97 | if ((string)hash["handle"] != null) |
| 98 | { | 98 | { |
| 99 | realHandle = Convert.ToUInt64((string)hash["handle"]); | 99 | realHandle = Convert.ToUInt64((string)hash["handle"]); |
| 100 | m_log.Debug(">> HERE, realHandle: " + realHandle); | 100 | //m_log.Debug(">> HERE, realHandle: " + realHandle); |
| 101 | } | 101 | } |
| 102 | //if (hash["region_image"] != null) | 102 | //if (hash["region_image"] != null) |
| 103 | //{ | 103 | //{ |