diff options
| author | Melanie | 2010-12-30 01:40:38 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-30 01:40:38 +0000 |
| commit | 3b50066ceb620ec00c50e3ea52be398e9914afdc (patch) | |
| tree | af41bb529e93a0d2cf5e2ee002f0231d300c0d16 /OpenSim/Region/Framework | |
| parent | Implement SendPlacesReply (diff) | |
| parent | Implement SendPlacesReply (diff) | |
| download | opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.zip opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.gz opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.bz2 opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a90caa9..066e504 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -836,8 +836,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 836 | { | 836 | { |
| 837 | uint xcell = (uint)((int)otherRegion.RegionLocX / (int)Constants.RegionSize); | 837 | uint xcell = (uint)((int)otherRegion.RegionLocX / (int)Constants.RegionSize); |
| 838 | uint ycell = (uint)((int)otherRegion.RegionLocY / (int)Constants.RegionSize); | 838 | uint ycell = (uint)((int)otherRegion.RegionLocY / (int)Constants.RegionSize); |
| 839 | m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}", | 839 | //m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}", |
| 840 | RegionInfo.RegionName, otherRegion.RegionName, xcell, ycell); | 840 | // RegionInfo.RegionName, otherRegion.RegionName, xcell, ycell); |
| 841 | 841 | ||
| 842 | if (RegionInfo.RegionHandle != otherRegion.RegionHandle) | 842 | if (RegionInfo.RegionHandle != otherRegion.RegionHandle) |
| 843 | { | 843 | { |