diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ae914b3..ce713c5 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1368,14 +1368,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
1368 | m_sceneXmlLoader.SavePrimsToXml2(fileName); | 1368 | m_sceneXmlLoader.SavePrimsToXml2(fileName); |
1369 | } | 1369 | } |
1370 | 1370 | ||
1371 | /// <summary> | ||
1372 | /// Locate New region Handle and offset the prim position for the new region | ||
1373 | /// | ||
1374 | /// </summary> | ||
1375 | /// <param name="position">current position of Group</param> | ||
1376 | /// <param name="grp">Scene Object Group that we're crossing</param> | ||
1377 | |||
1371 | public void CrossPrimGroupIntoNewRegion(LLVector3 position, SceneObjectGroup grp) | 1378 | public void CrossPrimGroupIntoNewRegion(LLVector3 position, SceneObjectGroup grp) |
1372 | { | 1379 | { |
1373 | m_log.Warn("Prim crossing: " + grp.UUID.ToString()); | 1380 | m_log.Warn("Prim crossing: " + grp.UUID.ToString()); |
1374 | int thisx = (int)RegionInfo.RegionLocX; | 1381 | int thisx = (int)RegionInfo.RegionLocX; |
1375 | int thisy = (int)RegionInfo.RegionLocY; | 1382 | int thisy = (int)RegionInfo.RegionLocY; |
1376 | 1383 | ||
1377 | int primcrossingXMLmethod = 0; | ||
1378 | |||
1379 | ulong newRegionHandle = 0; | 1384 | ulong newRegionHandle = 0; |
1380 | LLVector3 pos = position; | 1385 | LLVector3 pos = position; |
1381 | 1386 | ||
@@ -1410,6 +1415,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1410 | // Offset the positions for the new region across the border | 1415 | // Offset the positions for the new region across the border |
1411 | grp.OffsetForNewRegion(pos); | 1416 | grp.OffsetForNewRegion(pos); |
1412 | 1417 | ||
1418 | CrossPrimGroupIntoNewRegion(newRegionHandle, grp); | ||
1419 | |||
1420 | } | ||
1421 | public void CrossPrimGroupIntoNewRegion(ulong newRegionHandle, SceneObjectGroup grp) | ||
1422 | { | ||
1423 | int primcrossingXMLmethod = 0; | ||
1413 | if (newRegionHandle != 0) | 1424 | if (newRegionHandle != 0) |
1414 | { | 1425 | { |
1415 | bool successYN = false; | 1426 | bool successYN = false; |