diff options
| author | Diva Canto | 2014-07-03 20:09:16 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-07-03 20:09:16 -0700 |
| commit | 9643792b3417bd7a0d40fce362ffc12e176eb73d (patch) | |
| tree | 56e20a6911d3dccd528e7368c63385058d9daf27 /OpenSim/Region/CoreModules/Framework | |
| parent | add LSL constants PRIM_SPECULAR and PRIM_NORMAL (diff) | |
| download | opensim-SC-9643792b3417bd7a0d40fce362ffc12e176eb73d.zip opensim-SC-9643792b3417bd7a0d40fce362ffc12e176eb73d.tar.gz opensim-SC-9643792b3417bd7a0d40fce362ffc12e176eb73d.tar.bz2 opensim-SC-9643792b3417bd7a0d40fce362ffc12e176eb73d.tar.xz | |
Avoid an exception in creating child agents some times.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -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 d626771..7c3d50b 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1867,6 +1867,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1867 | //foreach (ulong h in agent.ChildrenCapSeeds.Keys) | 1867 | //foreach (ulong h in agent.ChildrenCapSeeds.Keys) |
| 1868 | // m_log.DebugFormat("[XXX] --> {0}", h); | 1868 | // m_log.DebugFormat("[XXX] --> {0}", h); |
| 1869 | //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); | 1869 | //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); |
| 1870 | if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle)) | ||
| 1871 | agent.ChildrenCapSeeds.Remove(region.RegionHandle); | ||
| 1870 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); | 1872 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); |
| 1871 | 1873 | ||
| 1872 | if (sp.Scene.CapsModule != null) | 1874 | if (sp.Scene.CapsModule != null) |