aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-02-01 20:36:10 +0000
committerdiva2009-02-01 20:36:10 +0000
commitdee6ad715412a5adeeb46c404726053ce8310e79 (patch)
tree215e5f0ae1e212a6148a4c1e18318ee89a860a8b
parentThank you kindly, TLaukkan (Tommil) for a patch that: (diff)
downloadopensim-SC_OLD-dee6ad715412a5adeeb46c404726053ce8310e79.zip
opensim-SC_OLD-dee6ad715412a5adeeb46c404726053ce8310e79.tar.gz
opensim-SC_OLD-dee6ad715412a5adeeb46c404726053ce8310e79.tar.bz2
opensim-SC_OLD-dee6ad715412a5adeeb46c404726053ce8310e79.tar.xz
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.
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
index 070736e..5a44902 100644
--- a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
@@ -78,9 +78,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
78 Caps oldCaps = m_capsHandlers[agentId]; 78 Caps oldCaps = m_capsHandlers[agentId];
79 79
80 m_log.DebugFormat( 80 m_log.DebugFormat(
81 "[CAPS]: Reregistering caps for agent {0}. Old caps path {1}, new caps path {2}", 81 "[CAPS]: Reregistering caps for agent {0}. Old caps path {1}, new caps path {2}. Ignoring. ",
82 agentId, oldCaps.CapsObjectPath, capsObjectPath); 82 agentId, oldCaps.CapsObjectPath, capsObjectPath);
83 //return; 83 // This should not happen. The caller code is confused. We need to fix that.
84 // CAPs can never be reregistered, or the client will be confused.
85 // Hence this return here.
86 return;
84 } 87 }
85 88
86 Caps caps 89 Caps caps