From 6034e5d112b0086cfd4768d58289e301358a2c6a Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 4 Feb 2012 00:28:22 -0500
Subject: Add default value to TelehubObject
---
OpenSim/Data/MySQL/Resources/RegionStore.migrations | 10 ++++++++++
1 file changed, 10 insertions(+)
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;
BEGIN;
ALTER TABLE regionsettings ADD COLUMN covenant_datetime int unsigned NOT NULL DEFAULT '0';
COMMIT;
+
+:VERSION 43 #---------------------
+
+BEGIN;
+
+ALTER TABLE `regionsettings` MODIFY COLUMN `TelehubObject` VARCHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+
+COMMIT;
+
+
--
cgit v1.1
From 43b4e4cfc3719477e1343222380d014906b51255 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 4 Feb 2012 19:08:52 -0500
Subject: Quiet the map module logging
---
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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
///
public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
{
- m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName);
+ // m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName);
LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
return mapResponse;
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
public virtual void HandleMapItemRequest(IClientAPI remoteClient, uint flags,
uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
{
- m_log.DebugFormat("[WORLD MAP]: Handle MapItem request {0} {1}", regionhandle, itemtype);
+ // m_log.DebugFormat("[WORLD MAP]: Handle MapItem request {0} {1}", regionhandle, itemtype);
lock (m_rootAgents)
{
--
cgit v1.1
From df07b97abd99ae2bac793c2423a283b9099932d1 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 4 Feb 2012 21:30:16 -0500
Subject: Make NonphysicalPrimMax setting work properly
RegionInfo setting will override only if it is > 0
---
OpenSim/Framework/RegionInfo.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index e2664dd..1072e04 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -607,7 +607,7 @@ namespace OpenSim.Framework
// Prim stuff
//
- m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 256);
+ m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
allKeys.Remove("NonphysicalPrimMax");
m_physPrimMax = config.GetInt("PhysicalPrimMax", 10);
allKeys.Remove("PhysicalPrimMax");
--
cgit v1.1
From 44badf452e72463950c21595b641b26844a5d1d3 Mon Sep 17 00:00:00 2001
From: nebadon
Date: Sat, 4 Feb 2012 19:41:25 -0700
Subject: change NonPhysicalPrimMax to NonphysicalPrimMax to make this variable
work correctly, it was being ignored because of the case, this effects
OpenSim.ini.example and OpenSimDefaults.ini
---
bin/OpenSim.ini.example | 2 +-
bin/OpenSimDefaults.ini | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 @@
;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
- ; NonPhysicalPrimMax = 256
+ ; NonphysicalPrimMax = 256
;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
;; 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 @@
allow_regionless = false
; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
- NonPhysicalPrimMax = 256
+ NonphysicalPrimMax = 256
; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file.
PhysicalPrimMax = 10
--
cgit v1.1
From 36ed0dcdaa37e107a5512a8369eedc4151197efd Mon Sep 17 00:00:00 2001
From: nebadon
Date: Sat, 4 Feb 2012 19:45:10 -0700
Subject: change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make
the variable in OpenSim.ini and Regions.ini match
---
OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
- m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
+ m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys);
if (RegionInfo.NonphysPrimMax > 0)
{
m_maxNonphys = RegionInfo.NonphysPrimMax;
--
cgit v1.1
From 13999dfc1df67222ffe3481ae4e45ca273ed5460 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 4 Feb 2012 21:52:55 -0500
Subject: Set PhysPrimMax default to 0 so ini files won't be overridden
---
OpenSim/Framework/RegionInfo.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 1072e04..661b457 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -609,7 +609,7 @@ namespace OpenSim.Framework
//
m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
allKeys.Remove("NonphysicalPrimMax");
- m_physPrimMax = config.GetInt("PhysicalPrimMax", 10);
+ m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
allKeys.Remove("PhysicalPrimMax");
m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
allKeys.Remove("ClampPrimSize");
--
cgit v1.1
From 35f14a262dfa3d9199f554154a63f5f532460f56 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 5 Feb 2012 03:44:15 +0000
Subject: Remove checks on ban list expiry on every move. To be re-added on
parcel boundary crossing only as soon as I'm properly awake. This should fix
recent performance issues
---
OpenSim/Region/CoreModules/World/Land/LandObject.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 3b4336f..d86d50e 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -418,8 +418,8 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsBannedFromLand(UUID avatar)
{
- ExpireAccessList();
-
+// ExpireAccessList();
+//
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
@@ -447,8 +447,8 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsRestrictedFromLand(UUID avatar)
{
- ExpireAccessList();
-
+// ExpireAccessList();
+//
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
--
cgit v1.1
From 8923ad755d97d5ddb4a29cb6f543b53195f0b461 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 5 Feb 2012 04:03:32 +0000
Subject: Check ban list for a particular parcel only when an avatar moves into
it. This restores functionality remove in the last commit without
reintroducing the performance penalty.
---
.../CoreModules/World/Land/LandManagementModule.cs | 17 +++++++++++++++++
OpenSim/Region/CoreModules/World/Land/LandObject.cs | 4 ----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 1c503aa..00ac44d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -389,6 +389,8 @@ namespace OpenSim.Region.CoreModules.World.Land
{
if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
{
+ ExpireAccessList(parcelAvatarIsEntering);
+
if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID))
{
SendYouAreBannedNotice(avatar);
@@ -1711,5 +1713,20 @@ namespace OpenSim.Region.CoreModules.World.Land
MainConsole.Instance.Output(report.ToString());
}
+
+ private void ExpireAccessList(ILandObject land)
+ {
+ List delete = new List();
+
+ foreach (LandAccessEntry entry in land.LandData.ParcelAccessList)
+ {
+ if (entry.Expires != 0 && entry.Expires < Util.UnixTimeSinceEpoch())
+ delete.Add(entry);
+ }
+ foreach (LandAccessEntry entry in delete)
+ land.LandData.ParcelAccessList.Remove(entry);
+
+ m_scene.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land);
+ }
}
}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index d86d50e..9aff86c 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -418,8 +418,6 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsBannedFromLand(UUID avatar)
{
-// ExpireAccessList();
-//
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
@@ -447,8 +445,6 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsRestrictedFromLand(UUID avatar)
{
-// ExpireAccessList();
-//
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
--
cgit v1.1
From 4e11983c7c2ba153f3d359e9b5a587fc966deb09 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 5 Feb 2012 12:38:20 -0500
Subject: Make configuration uniform
Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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
for (int i = 0; i < parts.Length; i++)
{
SceneObjectPart part = parts[i];
- if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax ||
- part.Scale.Y > m_scene.RegionInfo.PhysPrimMax ||
- part.Scale.Z > m_scene.RegionInfo.PhysPrimMax)
+ if (part.Scale.X > m_scene.m_maxPhys ||
+ part.Scale.Y > m_scene.m_maxPhys ||
+ part.Scale.Z > m_scene.m_maxPhys )
{
UsePhysics = false; // Reset physics
break;
--
cgit v1.1
From 0904772a6f14e4f03d199d8def063d6fb16414eb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 5 Feb 2012 20:12:35 +0000
Subject: Revert "Check ban list for a particular parcel only when an avatar
moves into it."
This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461.
---
.../CoreModules/World/Land/LandManagementModule.cs | 17 -----------------
OpenSim/Region/CoreModules/World/Land/LandObject.cs | 4 ++++
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 00ac44d..1c503aa 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -389,8 +389,6 @@ namespace OpenSim.Region.CoreModules.World.Land
{
if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
{
- ExpireAccessList(parcelAvatarIsEntering);
-
if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID))
{
SendYouAreBannedNotice(avatar);
@@ -1713,20 +1711,5 @@ namespace OpenSim.Region.CoreModules.World.Land
MainConsole.Instance.Output(report.ToString());
}
-
- private void ExpireAccessList(ILandObject land)
- {
- List delete = new List();
-
- foreach (LandAccessEntry entry in land.LandData.ParcelAccessList)
- {
- if (entry.Expires != 0 && entry.Expires < Util.UnixTimeSinceEpoch())
- delete.Add(entry);
- }
- foreach (LandAccessEntry entry in delete)
- land.LandData.ParcelAccessList.Remove(entry);
-
- m_scene.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land);
- }
}
}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 9aff86c..d86d50e 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -418,6 +418,8 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsBannedFromLand(UUID avatar)
{
+// ExpireAccessList();
+//
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
@@ -445,6 +447,8 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsRestrictedFromLand(UUID avatar)
{
+// ExpireAccessList();
+//
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
--
cgit v1.1
From a5fcdde179f41d09e0ff94f23fd84f1766457e69 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 5 Feb 2012 20:12:45 +0000
Subject: Revert "Remove checks on ban list expiry on every move. To be
re-added on parcel"
This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56.
---
OpenSim/Region/CoreModules/World/Land/LandObject.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index d86d50e..3b4336f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -418,8 +418,8 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsBannedFromLand(UUID avatar)
{
-// ExpireAccessList();
-//
+ ExpireAccessList();
+
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
@@ -447,8 +447,8 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool IsRestrictedFromLand(UUID avatar)
{
-// ExpireAccessList();
-//
+ ExpireAccessList();
+
if (m_scene.Permissions.IsAdministrator(avatar))
return false;
--
cgit v1.1
From 130b1c0665d0439bdf4fe0662ee418c4f7c7e167 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 5 Feb 2012 20:47:02 +0000
Subject: Revert my two quick fixes for the lag issue and put in the real fix,
which is to only write to the database if data was changed. I was writing to
the db on every step of every avatar. Sure to give us lag, that.
---
OpenSim/Region/CoreModules/World/Land/LandObject.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
foreach (LandAccessEntry entry in delete)
LandData.ParcelAccessList.Remove(entry);
- m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this);
+ if (delete.Count > 0)
+ m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this);
}
}
}
--
cgit v1.1