diff options
author | Justin Clark-Casey (justincc) | 2014-04-11 00:20:05 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-04-11 00:29:06 +0100 |
commit | 530c86335d637ed72411c1161c89ece166160586 (patch) | |
tree | 13b8db0239ebdd5d070b4777aefb083857505540 /OpenSim/Tests | |
parent | BulletSim: small tweek to avatar height reduce feet embedded into prims. (diff) | |
download | opensim-SC_OLD-530c86335d637ed72411c1161c89ece166160586.zip opensim-SC_OLD-530c86335d637ed72411c1161c89ece166160586.tar.gz opensim-SC_OLD-530c86335d637ed72411c1161c89ece166160586.tar.bz2 opensim-SC_OLD-530c86335d637ed72411c1161c89ece166160586.tar.xz |
Fix the presence info caching used in llRequestAgentData(), which was completely inoperative.
This means the presence info may be out of date by up to 20 seconds, but this avoids scripts potentially triggering constants requests to user accout and presence info services.
Relates to http://opensimulator.org/mantis/view.php?id=7088 though I fixed in a different way.
Adds regression test for this case.
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 8f44555..eb8078d 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -30,6 +30,7 @@ using System.Net; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Data.Null; | ||
33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
35 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
@@ -301,6 +302,11 @@ namespace OpenSim.Tests.Common | |||
301 | /// <param name="testScene"></param> | 302 | /// <param name="testScene"></param> |
302 | private static LocalPresenceServicesConnector StartPresenceService() | 303 | private static LocalPresenceServicesConnector StartPresenceService() |
303 | { | 304 | { |
305 | // Unfortunately, some services share data via statics, so we need to null every time to stop interference | ||
306 | // between tests. | ||
307 | // This is a massive non-obvious pita. | ||
308 | NullPresenceData.Instance = null; | ||
309 | |||
304 | IConfigSource config = new IniConfigSource(); | 310 | IConfigSource config = new IniConfigSource(); |
305 | config.AddConfig("Modules"); | 311 | config.AddConfig("Modules"); |
306 | config.AddConfig("PresenceService"); | 312 | config.AddConfig("PresenceService"); |