OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
bullet-2.82
Justin Clark-Casey (justincc) 2014-07-04 22:59:10 +01:00
parent 82b875317b
commit 20b47fce07
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1874,8 +1874,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// m_log.DebugFormat("[XXX] --> {0}", h); // m_log.DebugFormat("[XXX] --> {0}", h);
//m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle)) if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle))
agent.ChildrenCapSeeds.Remove(region.RegionHandle); {
agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); m_log.WarnFormat(
"[ENTITY TRANSFER]: Overwriting caps seed {0} with {1} for region {2} (handle {3}) for {4} in {5}",
agent.ChildrenCapSeeds[region.RegionHandle], agent.CapsPath,
region.RegionName, region.RegionHandle, sp.Name, Scene.Name);
}
agent.ChildrenCapSeeds[region.RegionHandle] = agent.CapsPath;
if (sp.Scene.CapsModule != null) if (sp.Scene.CapsModule != null)
{ {