aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2015-09-26 01:31:57 +0100
committerUbitUmarov2015-09-26 01:31:57 +0100
commit0fb033e56766b433ccd03347b22e8141c28acaec (patch)
tree39de449d49292d7fe78059c4cef3ce51b84b4bd1 /OpenSim/Region/CoreModules
parent revert previus wrong commit (diff)
downloadopensim-SC_OLD-0fb033e56766b433ccd03347b22e8141c28acaec.zip
opensim-SC_OLD-0fb033e56766b433ccd03347b22e8141c28acaec.tar.gz
opensim-SC_OLD-0fb033e56766b433ccd03347b22e8141c28acaec.tar.bz2
opensim-SC_OLD-0fb033e56766b433ccd03347b22e8141c28acaec.tar.xz
fix object crossings to other scene on same instance
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 1f782f5..6752e31 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -201,12 +201,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
201 uint regionX = Util.WorldToRegionLoc((uint)x); 201 uint regionX = Util.WorldToRegionLoc((uint)x);
202 uint regionY = Util.WorldToRegionLoc((uint)y); 202 uint regionY = Util.WorldToRegionLoc((uint)y);
203 203
204 /* we are insane now
204 // Sanity check 205 // Sanity check
205 if ((Util.RegionToWorldLoc(regionX) != (uint)x) || (Util.RegionToWorldLoc(regionY) != (uint)y)) 206 if ((Util.RegionToWorldLoc(regionX) != (uint)x) || (Util.RegionToWorldLoc(regionY) != (uint)y))
206 { 207 {
207 m_log.WarnFormat("{0} GetRegionByPosition. Bad position requested: not the base of the region. Requested Pos=<{1},{2}>, Should Be=<{3},{4}>", 208 m_log.WarnFormat("{0} GetRegionByPosition. Bad position requested: not the base of the region. Requested Pos=<{1},{2}>, Should Be=<{3},{4}>",
208 LogHeader, x, y, Util.RegionToWorldLoc(regionX), Util.RegionToWorldLoc(regionY)); 209 LogHeader, x, y, Util.RegionToWorldLoc(regionX), Util.RegionToWorldLoc(regionY));
209 } 210 }
211 */
210 212
211 // First see if it's a neighbour, even if it isn't on this sim. 213 // First see if it's a neighbour, even if it isn't on this sim.
212 // Neighbour data is cached in memory, so this is fast 214 // Neighbour data is cached in memory, so this is fast