From f9dd4ed89c7aff63191c3be0bfa9d24d15d1d4bc Mon Sep 17 00:00:00 2001 From: Snoopy Pfeffer Date: Tue, 10 Apr 2012 15:51:26 +0200 Subject: [PATCH 1/3] Do not timeout group member cache entry, as long as there are frequent group membership requests. These are caused by movements within the parcel boundaries. --- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index ced7b523b2..7f44613d5e 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -429,7 +429,10 @@ namespace OpenSim.Region.CoreModules.World.Land { bool isMember; if (m_groupMemberCache.TryGetValue(avatar, out isMember)) + { + m_groupMemberCache.Update(avatar, isMember, m_groupMemberCacheTimeout); return isMember; + } IGroupsModule groupsModule = m_scene.RequestModuleInterface(); if (groupsModule == null) From 2b339bfd9702d2d1c988b87bc806b7fe3bdbed69 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 10 Apr 2012 17:22:02 +0100 Subject: [PATCH 2/3] Correct max_listeners_per_region in OpenSimDefaults.ini to max_listens_per_region Value for this setting in OpenSimDefaults.ini (1000) is same as setting in code (1000) so this should have no effect Thanks to Ovi Chris Rouly for pointing this out. --- bin/OpenSimDefaults.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 45d604f829..68a2ea307f 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1129,7 +1129,7 @@ ; Maximum number of llListen events we allow over the entire region. ; Set this to 0 to have no limit imposed - max_listeners_per_region = 1000 + max_listens_per_region = 1000 ; Maximum number of llListen events we allow per script ; Set this to 0 to have no limit imposed. From fb44e7b636f35a773c016dcfbd56318d6d337c57 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 10 Apr 2012 17:46:34 +0100 Subject: [PATCH 3/3] minor: convert tabs to spaces in config example files from recent 7c534e5 --- bin/Robust.HG.ini.example | 12 ++++++------ bin/config-include/StandaloneCommon.ini.example | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 0eb8291679..4ea5ffd051 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -319,13 +319,13 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; password help: optional: page providing password assistance for users of your grid ;password = http://127.0.0.1/password - ; HG address of the gatekeeper, if you have one - ; this is the entry point for all the regions of the world - ; gatekeeper = http://127.0.0.1:8002/ + ; HG address of the gatekeeper, if you have one + ; this is the entry point for all the regions of the world + ; gatekeeper = http://127.0.0.1:8002/ - ; HG user domain, if you have one - ; this is the entry point for all user-related HG services - ; uas = http://127.0.0.1:8002/ + ; HG user domain, if you have one + ; this is the entry point for all user-related HG services + ; uas = http://127.0.0.1:8002/ [GatekeeperService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 4f4f4005d0..8fe64df93e 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -231,13 +231,13 @@ ; currently unused ;password = http://127.0.0.1/password - ; HG address of the gatekeeper, if you have one - ; this is the entry point for all the regions of the world - ; gatekeeper = http://127.0.0.1:9000/ + ; HG address of the gatekeeper, if you have one + ; this is the entry point for all the regions of the world + ; gatekeeper = http://127.0.0.1:9000/ - ; HG user domain, if you have one - ; this is the entry point for all user-related HG services - ; uas = http://127.0.0.1:9000/ + ; HG user domain, if you have one + ; this is the entry point for all user-related HG services + ; uas = http://127.0.0.1:9000/ [MapImageService] ; Set this if you want to change the default