diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-11 20:32:05 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-11 20:32:05 -0400 |
| commit | 2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3 (patch) | |
| tree | b8a0cc747dd73da553d8d3504d3c842d9283be73 /OpenSim/Region/Framework | |
| parent | Try something to help the tests complete. (diff) | |
| parent | Fixes a race condition in EQ processing that was making EQs pop up again upon... (diff) | |
| download | opensim-SC_OLD-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.zip opensim-SC_OLD-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.gz opensim-SC_OLD-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.bz2 opensim-SC_OLD-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 4f2b6ec..0140faa 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -1319,17 +1319,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1319 | return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber); | 1319 | return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber); |
| 1320 | } | 1320 | } |
| 1321 | 1321 | ||
| 1322 | // private void Dump(string msg, List<ulong> handles) | 1322 | //private void Dump(string msg, List<ulong> handles) |
| 1323 | // { | 1323 | //{ |
| 1324 | // m_log.Info"-------------- HANDLE DUMP ({0}) ---------", msg); | 1324 | // m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); |
| 1325 | // foreach (ulong handle in handles) | 1325 | // foreach (ulong handle in handles) |
| 1326 | // { | 1326 | // { |
| 1327 | // uint x, y; | 1327 | // uint x, y; |
| 1328 | // Utils.LongToUInts(handle, out x, out y); | 1328 | // Utils.LongToUInts(handle, out x, out y); |
| 1329 | // x = x / Constants.RegionSize; | 1329 | // x = x / Constants.RegionSize; |
| 1330 | // y = y / Constants.RegionSize; | 1330 | // y = y / Constants.RegionSize; |
| 1331 | // m_log.Info("({0}, {1})", x, y); | 1331 | // m_log.InfoFormat("({0}, {1})", x, y); |
| 1332 | // } | 1332 | // } |
| 1333 | // } | 1333 | //} |
| 1334 | } | 1334 | } |
| 1335 | } | 1335 | } |