diff options
| author | Diva Canto | 2014-07-04 15:56:32 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-07-04 15:56:32 -0700 |
| commit | dac870394984b197e76321afcdf7d554c747081d (patch) | |
| tree | 9f07b7db098867c5303b841bca81727ea1f19686 /OpenSim/Region/CoreModules | |
| parent | Instrument the UDP path of creating assets so that it triggers an asset post ... (diff) | |
| parent | minor: put standard 'category' in brackets at front of log messages from prev... (diff) | |
| download | opensim-SC-dac870394984b197e76321afcdf7d554c747081d.zip opensim-SC-dac870394984b197e76321afcdf7d554c747081d.tar.gz opensim-SC-dac870394984b197e76321afcdf7d554c747081d.tar.bz2 opensim-SC-dac870394984b197e76321afcdf7d554c747081d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 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 | { |