diff options
| author | Melanie | 2013-07-25 16:55:23 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-25 16:55:23 +0100 |
| commit | 7914eaa35761952a0e5518bb4685a04d4917d03b (patch) | |
| tree | 260b0fcb77285129181efab847f29b9570baf35b /OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Deleted all [ZZZ] debug messages. (diff) | |
| download | opensim-SC-7914eaa35761952a0e5518bb4685a04d4917d03b.zip opensim-SC-7914eaa35761952a0e5518bb4685a04d4917d03b.tar.gz opensim-SC-7914eaa35761952a0e5518bb4685a04d4917d03b.tar.bz2 opensim-SC-7914eaa35761952a0e5518bb4685a04d4917d03b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSimDefaults.ini
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs index 79d6fc5..3ac74fc 100644 --- a/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs +++ b/OpenSim/Addons/Groups/RemoteConnectorCacheWrapper.cs | |||
| @@ -53,7 +53,7 @@ namespace OpenSim.Groups | |||
| 53 | private ForeignImporter m_ForeignImporter; | 53 | private ForeignImporter m_ForeignImporter; |
| 54 | 54 | ||
| 55 | private Dictionary<string, bool> m_ActiveRequests = new Dictionary<string, bool>(); | 55 | private Dictionary<string, bool> m_ActiveRequests = new Dictionary<string, bool>(); |
| 56 | private const int GROUPS_CACHE_TIMEOUT = 5 * 60; // 5 minutes | 56 | private const int GROUPS_CACHE_TIMEOUT = 1 * 60; // 1 minutes |
| 57 | 57 | ||
| 58 | // This all important cache cahces objects of different types: | 58 | // This all important cache cahces objects of different types: |
| 59 | // group-<GroupID> or group-<Name> => ExtendedGroupRecord | 59 | // group-<GroupID> or group-<Name> => ExtendedGroupRecord |