diff options
| author | Diva Canto | 2014-07-03 20:09:16 -0700 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-08-02 00:50:21 +0100 |
| commit | e9447cc8361864ca2830689ae353cfd742290042 (patch) | |
| tree | 8266b1b1dce5b4102d153c0f085f2b4be35ba8cb | |
| parent | Temporarily disable new regression test TestLifecycle() until I have a chance... (diff) | |
| download | opensim-SC_OLD-e9447cc8361864ca2830689ae353cfd742290042.zip opensim-SC_OLD-e9447cc8361864ca2830689ae353cfd742290042.tar.gz opensim-SC_OLD-e9447cc8361864ca2830689ae353cfd742290042.tar.bz2 opensim-SC_OLD-e9447cc8361864ca2830689ae353cfd742290042.tar.xz | |
Avoid an exception in creating child agents some times.
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index b157e6b..d20dbf2 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1866,6 +1866,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1866 | //foreach (ulong h in agent.ChildrenCapSeeds.Keys) | 1866 | //foreach (ulong h in agent.ChildrenCapSeeds.Keys) |
| 1867 | // m_log.DebugFormat("[XXX] --> {0}", h); | 1867 | // m_log.DebugFormat("[XXX] --> {0}", h); |
| 1868 | //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); | 1868 | //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); |
| 1869 | if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle)) | ||
| 1870 | agent.ChildrenCapSeeds.Remove(region.RegionHandle); | ||
| 1869 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); | 1871 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); |
| 1870 | 1872 | ||
| 1871 | if (sp.Scene.CapsModule != null) | 1873 | if (sp.Scene.CapsModule != null) |