diff options
author | Justin Clark-Casey (justincc) | 2014-07-04 22:59:10 +0100 |
---|---|---|
committer | Justin Clark-Casey | 2014-08-02 00:51:57 +0100 |
commit | e87a0d9db1914a74cf5dbe3461ee19dcdb6e4b48 (patch) | |
tree | 51ead6cb3e48fdc9c28a62f0829bec15cbeca95d | |
parent | On logout, delay the removal of AgentCircuitData until the very end, because ... (diff) | |
download | opensim-SC_OLD-e87a0d9db1914a74cf5dbe3461ee19dcdb6e4b48.zip opensim-SC_OLD-e87a0d9db1914a74cf5dbe3461ee19dcdb6e4b48.tar.gz opensim-SC_OLD-e87a0d9db1914a74cf5dbe3461ee19dcdb6e4b48.tar.bz2 opensim-SC_OLD-e87a0d9db1914a74cf5dbe3461ee19dcdb6e4b48.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
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 10 |
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 e4bbe6b..d247c7d 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1886,8 +1886,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1886 | // m_log.DebugFormat("[XXX] --> {0}", h); | 1886 | // m_log.DebugFormat("[XXX] --> {0}", h); |
1887 | //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); | 1887 | //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); |
1888 | if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle)) | 1888 | if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle)) |
1889 | agent.ChildrenCapSeeds.Remove(region.RegionHandle); | 1889 | { |
1890 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); | 1890 | m_log.WarnFormat( |
1891 | "[ENTITY TRANSFER]: Overwriting caps seed {0} with {1} for region {2} (handle {3}) for {4} in {5}", | ||
1892 | agent.ChildrenCapSeeds[region.RegionHandle], agent.CapsPath, | ||
1893 | region.RegionName, region.RegionHandle, sp.Name, Scene.Name); | ||
1894 | } | ||
1895 | |||
1896 | agent.ChildrenCapSeeds[region.RegionHandle] = agent.CapsPath; | ||
1891 | 1897 | ||
1892 | if (sp.Scene.CapsModule != null) | 1898 | if (sp.Scene.CapsModule != null) |
1893 | { | 1899 | { |