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

Putting the return back in AddCapsHandler upon attempt at adding CAPs twice. The return seems to have been commented in 8038, as an attempt at fixing multiple TP problems later identified to be deadlocks. CAPs should never be overwritten, or the viewer can get confused. Right now this method is erroneously being called twice because of legacy code. I'll fix that later, after further testing.

0.6.3-post-fixes
diva 2009-02-01 20:36:10 +00:00
parent 50536c66a0
commit dee6ad7154
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
View File

@ -78,9 +78,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
Caps oldCaps = m_capsHandlers[agentId]; Caps oldCaps = m_capsHandlers[agentId];
m_log.DebugFormat( m_log.DebugFormat(
"[CAPS]: Reregistering caps for agent {0}. Old caps path {1}, new caps path {2}", "[CAPS]: Reregistering caps for agent {0}. Old caps path {1}, new caps path {2}. Ignoring. ",
agentId, oldCaps.CapsObjectPath, capsObjectPath); agentId, oldCaps.CapsObjectPath, capsObjectPath);
//return; // This should not happen. The caller code is confused. We need to fix that.
// CAPs can never be reregistered, or the client will be confused.
// Hence this return here.
return;
} }
Caps caps Caps caps