diff options
author | Robert Adams | 2013-12-26 22:45:59 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-26 22:45:59 -0800 |
commit | 2d2bea4aa75ff6e82384f0842fe3719bf946b1cc (patch) | |
tree | 9c1429ad59674925944ece4ec366888794e91822 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | varregion: add lots of DEBUG level log messages. Especially for teleport. (diff) | |
download | opensim-SC_OLD-2d2bea4aa75ff6e82384f0842fe3719bf946b1cc.zip opensim-SC_OLD-2d2bea4aa75ff6e82384f0842fe3719bf946b1cc.tar.gz opensim-SC_OLD-2d2bea4aa75ff6e82384f0842fe3719bf946b1cc.tar.bz2 opensim-SC_OLD-2d2bea4aa75ff6e82384f0842fe3719bf946b1cc.tar.xz |
varregion: many more updates removing the constant RegionSize and replacing
with a passed region size. This time in the map code and grid services code.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index d4cbf7d..44c476c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -331,7 +331,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
331 | { | 331 | { |
332 | get | 332 | get |
333 | { | 333 | { |
334 | Vector3 minScale = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionSize); | 334 | Vector3 minScale = new Vector3(Constants.MaximumRegionSize, Constants.MaximumRegionSize, Constants.MaximumRegionSize); |
335 | Vector3 maxScale = Vector3.Zero; | 335 | Vector3 maxScale = Vector3.Zero; |
336 | Vector3 finalScale = new Vector3(0.5f, 0.5f, 0.5f); | 336 | Vector3 finalScale = new Vector3(0.5f, 0.5f, 0.5f); |
337 | 337 | ||
@@ -517,14 +517,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
517 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | 517 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); |
518 | 518 | ||
519 | // Normalize | 519 | // Normalize |
520 | if (val.X >= Constants.RegionSize) | 520 | if (val.X >= m_scene.RegionInfo.RegionSizeX) |
521 | val.X -= Constants.RegionSize; | 521 | val.X -= m_scene.RegionInfo.RegionSizeX; |
522 | if (val.Y >= Constants.RegionSize) | 522 | if (val.Y >= m_scene.RegionInfo.RegionSizeY) |
523 | val.Y -= Constants.RegionSize; | 523 | val.Y -= m_scene.RegionInfo.RegionSizeY; |
524 | if (val.X < 0) | 524 | if (val.X < 0) |
525 | val.X += Constants.RegionSize; | 525 | val.X += m_scene.RegionInfo.RegionSizeX; |
526 | if (val.Y < 0) | 526 | if (val.Y < 0) |
527 | val.Y += Constants.RegionSize; | 527 | val.Y += m_scene.RegionInfo.RegionSizeY; |
528 | 528 | ||
529 | // If it's deleted, crossing was successful | 529 | // If it's deleted, crossing was successful |
530 | if (IsDeleted) | 530 | if (IsDeleted) |
@@ -572,9 +572,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
572 | } | 572 | } |
573 | } | 573 | } |
574 | Vector3 oldp = AbsolutePosition; | 574 | Vector3 oldp = AbsolutePosition; |
575 | val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f); | 575 | val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)m_scene.RegionInfo.RegionSizeX - 0.5f); |
576 | val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f); | 576 | val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)m_scene.RegionInfo.RegionSizeY - 0.5f); |
577 | val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f); | 577 | val.Z = Util.Clamp<float>(oldp.Z, 0.5f, Constants.RegionHeight); |
578 | } | 578 | } |
579 | } | 579 | } |
580 | 580 | ||