aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/MySQL/Resources/RegionStore.migrations10
-rw-r--r--OpenSim/Framework/RegionInfo.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs3
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
-rwxr-xr-xbin/OpenSim.ini.example2
-rw-r--r--bin/OpenSimDefaults.ini2
8 files changed, 22 insertions, 11 deletions
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 9891f4b..099beaf 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -874,3 +874,13 @@ COMMIT;
874BEGIN; 874BEGIN;
875ALTER TABLE regionsettings ADD COLUMN covenant_datetime int unsigned NOT NULL DEFAULT '0'; 875ALTER TABLE regionsettings ADD COLUMN covenant_datetime int unsigned NOT NULL DEFAULT '0';
876COMMIT; 876COMMIT;
877
878:VERSION 43 #---------------------
879
880BEGIN;
881
882ALTER TABLE `regionsettings` MODIFY COLUMN `TelehubObject` VARCHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
883
884COMMIT;
885
886
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index e2664dd..661b457 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -607,9 +607,9 @@ namespace OpenSim.Framework
607 607
608 // Prim stuff 608 // Prim stuff
609 // 609 //
610 m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256); 610 m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
611 allKeys.Remove("NonphysicalPrimMax"); 611 allKeys.Remove("NonphysicalPrimMax");
612 m_physPrimMax = config.GetInt("PhysicalPrimMax", 10); 612 m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
613 allKeys.Remove("PhysicalPrimMax"); 613 allKeys.Remove("PhysicalPrimMax");
614 m_clampPrimSize = config.GetBoolean("ClampPrimSize", false); 614 m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
615 allKeys.Remove("ClampPrimSize"); 615 allKeys.Remove("ClampPrimSize");
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;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f9b405d..d45f72b 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -87,7 +87,7 @@
87 87
88 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 88 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
89 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 89 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
90 ; NonPhysicalPrimMax = 256 90 ; NonphysicalPrimMax = 256
91 91
92 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10 92 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
93 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file. 93 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3935c92..01cf791 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -82,7 +82,7 @@
82 allow_regionless = false 82 allow_regionless = false
83 83
84 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 84 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
85 NonPhysicalPrimMax = 256 85 NonphysicalPrimMax = 256
86 86
87 ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file. 87 ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file.
88 PhysicalPrimMax = 10 88 PhysicalPrimMax = 10