diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/Caps')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs index ad1c4ce..6545a99 100644 --- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | |||
@@ -132,13 +132,9 @@ namespace OpenSim.Region.CoreModules.Framework | |||
132 | { | 132 | { |
133 | Caps oldCaps = m_capsObjects[agentId]; | 133 | Caps oldCaps = m_capsObjects[agentId]; |
134 | 134 | ||
135 | m_log.DebugFormat( | 135 | //m_log.WarnFormat( |
136 | "[CAPS]: Recreating caps for agent {0}. Old caps path {1}, new caps path {2}. ", | 136 | // "[CAPS]: Recreating caps for agent {0} in region {1}. Old caps path {2}, new caps path {3}. ", |
137 | agentId, oldCaps.CapsObjectPath, capsObjectPath); | 137 | // agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath); |
138 | // This should not happen. The caller code is confused. We need to fix that. | ||
139 | // CAPs can never be reregistered, or the client will be confused. | ||
140 | // Hence this return here. | ||
141 | //return; | ||
142 | } | 138 | } |
143 | 139 | ||
144 | caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, | 140 | caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
@@ -153,6 +149,7 @@ namespace OpenSim.Region.CoreModules.Framework | |||
153 | 149 | ||
154 | public void RemoveCaps(UUID agentId) | 150 | public void RemoveCaps(UUID agentId) |
155 | { | 151 | { |
152 | m_log.DebugFormat("[CAPS]: Remove caps for agent {0} in region {1}", agentId, m_scene.RegionInfo.RegionName); | ||
156 | lock (m_childrenSeeds) | 153 | lock (m_childrenSeeds) |
157 | { | 154 | { |
158 | if (m_childrenSeeds.ContainsKey(agentId)) | 155 | if (m_childrenSeeds.ContainsKey(agentId)) |