diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d94d5ef..3af1060 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -123,6 +123,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
123 | /// </summary> | 123 | /// </summary> |
124 | public float m_maxPhys = 10; | 124 | public float m_maxPhys = 10; |
125 | 125 | ||
126 | /// <summary> | ||
127 | /// Max prims an object will hold | ||
128 | /// </summary> | ||
129 | public int m_linksetCapacity = 0; | ||
130 | |||
126 | public bool m_clampPrimSize; | 131 | public bool m_clampPrimSize; |
127 | public bool m_trustBinaries; | 132 | public bool m_trustBinaries; |
128 | public bool m_allowScriptCrossings; | 133 | public bool m_allowScriptCrossings; |
@@ -789,6 +794,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
789 | m_maxPhys = RegionInfo.PhysPrimMax; | 794 | m_maxPhys = RegionInfo.PhysPrimMax; |
790 | } | 795 | } |
791 | 796 | ||
797 | m_linksetCapacity = startupConfig.GetInt("LinksetPrims", m_linksetCapacity); | ||
798 | if (RegionInfo.LinksetCapacity > 0) | ||
799 | { | ||
800 | m_linksetCapacity = RegionInfo.LinksetCapacity; | ||
801 | } | ||
802 | |||
792 | SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); | 803 | SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); |
793 | TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false); | 804 | TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false); |
794 | 805 | ||
@@ -4563,6 +4574,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
4563 | return LandChannel.GetLandObject(x, y).LandData; | 4574 | return LandChannel.GetLandObject(x, y).LandData; |
4564 | } | 4575 | } |
4565 | 4576 | ||
4577 | /// <summary> | ||
4578 | /// Get LandData by position. | ||
4579 | /// </summary> | ||
4580 | /// <param name="pos"></param> | ||
4581 | /// <returns></returns> | ||
4582 | public LandData GetLandData(Vector3 pos) | ||
4583 | { | ||
4584 | return GetLandData(pos.X, pos.Y); | ||
4585 | } | ||
4586 | |||
4566 | public LandData GetLandData(uint x, uint y) | 4587 | public LandData GetLandData(uint x, uint y) |
4567 | { | 4588 | { |
4568 | m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y); | 4589 | m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y); |