diff options
author | Justin Clark-Casey (justincc) | 2012-02-06 20:54:21 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-06 20:54:21 +0000 |
commit | 8a36f54cf41ae3c1809f34dfee4c60058605aa20 (patch) | |
tree | c05781596c843dae2d6fd670b72628a466df9014 /OpenSim/Region | |
parent | Merge branch 'master' into 0.7.3-post-fixes (diff) | |
parent | Revert my two quick fixes for the lag issue and put in the real fix, which (diff) | |
download | opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.zip opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.gz opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.bz2 opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.xz |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Region')
4 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 3b4336f..d146901 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -1139,7 +1139,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1139 | foreach (LandAccessEntry entry in delete) | 1139 | foreach (LandAccessEntry entry in delete) |
1140 | LandData.ParcelAccessList.Remove(entry); | 1140 | LandData.ParcelAccessList.Remove(entry); |
1141 | 1141 | ||
1142 | m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this); | 1142 | if (delete.Count > 0) |
1143 | m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this); | ||
1143 | } | 1144 | } |
1144 | } | 1145 | } |
1145 | } | 1146 | } |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 6c6aa37..b315d2c 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
288 | /// <returns></returns> | 288 | /// <returns></returns> |
289 | public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) | 289 | public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq) |
290 | { | 290 | { |
291 | m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName); | 291 | // m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName); |
292 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); | 292 | LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse(); |
293 | mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); | 293 | mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse()); |
294 | return mapResponse; | 294 | return mapResponse; |
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
373 | public virtual void HandleMapItemRequest(IClientAPI remoteClient, uint flags, | 373 | public virtual void HandleMapItemRequest(IClientAPI remoteClient, uint flags, |
374 | uint EstateID, bool godlike, uint itemtype, ulong regionhandle) | 374 | uint EstateID, bool godlike, uint itemtype, ulong regionhandle) |
375 | { | 375 | { |
376 | m_log.DebugFormat("[WORLD MAP]: Handle MapItem request {0} {1}", regionhandle, itemtype); | 376 | // m_log.DebugFormat("[WORLD MAP]: Handle MapItem request {0} {1}", regionhandle, itemtype); |
377 | 377 | ||
378 | lock (m_rootAgents) | 378 | lock (m_rootAgents) |
379 | { | 379 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 186e01c..3347822 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
645 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); | 645 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); |
646 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); | 646 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); |
647 | 647 | ||
648 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); | 648 | m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); |
649 | if (RegionInfo.NonphysPrimMax > 0) | 649 | if (RegionInfo.NonphysPrimMax > 0) |
650 | { | 650 | { |
651 | m_maxNonphys = RegionInfo.NonphysPrimMax; | 651 | m_maxNonphys = RegionInfo.NonphysPrimMax; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index e7f2fdb..8939342 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2423,9 +2423,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2423 | for (int i = 0; i < parts.Length; i++) | 2423 | for (int i = 0; i < parts.Length; i++) |
2424 | { | 2424 | { |
2425 | SceneObjectPart part = parts[i]; | 2425 | SceneObjectPart part = parts[i]; |
2426 | if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax || | 2426 | if (part.Scale.X > m_scene.m_maxPhys || |
2427 | part.Scale.Y > m_scene.RegionInfo.PhysPrimMax || | 2427 | part.Scale.Y > m_scene.m_maxPhys || |
2428 | part.Scale.Z > m_scene.RegionInfo.PhysPrimMax) | 2428 | part.Scale.Z > m_scene.m_maxPhys ) |
2429 | { | 2429 | { |
2430 | UsePhysics = false; // Reset physics | 2430 | UsePhysics = false; // Reset physics |
2431 | break; | 2431 | break; |