aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-07-04 22:59:10 +0100
committerJustin Clark-Casey (justincc)2014-07-04 22:59:10 +0100
commit20b47fce0736f1f887c358cbb29fac64ad36792f (patch)
treee22fc8468f7e6844f24aba6ad06b0b4193f13889 /OpenSim/Region/CoreModules/Framework/EntityTransfer
parentOn logout, delay the removal of AgentCircuitData until the very end, because ... (diff)
downloadopensim-SC_OLD-20b47fce0736f1f887c358cbb29fac64ad36792f.zip
opensim-SC_OLD-20b47fce0736f1f887c358cbb29fac64ad36792f.tar.gz
opensim-SC_OLD-20b47fce0736f1f887c358cbb29fac64ad36792f.tar.bz2
opensim-SC_OLD-20b47fce0736f1f887c358cbb29fac64ad36792f.tar.xz
Still log (but this time with warning rather than an exception) if we regenerate a new child caps seed for a region where we already have one.
I think it's still useful to know this to show up any errors early, but it's reasonable to still carry on rather than throw an exception. Follow on from Diva's commit 9643792
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 9abc8ae..f531859 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1874,8 +1874,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1874 // m_log.DebugFormat("[XXX] --> {0}", h); 1874 // m_log.DebugFormat("[XXX] --> {0}", h);
1875 //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); 1875 //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
1876 if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle)) 1876 if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle))
1877 agent.ChildrenCapSeeds.Remove(region.RegionHandle); 1877 {
1878 agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); 1878 m_log.WarnFormat(
1879 "[ENTITY TRANSFER]: Overwriting caps seed {0} with {1} for region {2} (handle {3}) for {4} in {5}",
1880 agent.ChildrenCapSeeds[region.RegionHandle], agent.CapsPath,
1881 region.RegionName, region.RegionHandle, sp.Name, Scene.Name);
1882 }
1883
1884 agent.ChildrenCapSeeds[region.RegionHandle] = agent.CapsPath;
1879 1885
1880 if (sp.Scene.CapsModule != null) 1886 if (sp.Scene.CapsModule != null)
1881 { 1887 {