aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMic Bowman2011-04-14 11:59:25 -0700
committerMic Bowman2011-04-14 11:59:25 -0700
commit22b307ea1cdcbcaef0861bad93534c6623687730 (patch)
tree367df50ee76f1a8bc94f90d7808d89910ddea84d
parentMerge branch 'testmerge' into queuetest (diff)
parentComment out the warning if the prioritizer runs without a fully (diff)
downloadopensim-SC_OLD-22b307ea1cdcbcaef0861bad93534c6623687730.zip
opensim-SC_OLD-22b307ea1cdcbcaef0861bad93534c6623687730.tar.gz
opensim-SC_OLD-22b307ea1cdcbcaef0861bad93534c6623687730.tar.bz2
opensim-SC_OLD-22b307ea1cdcbcaef0861bad93534c6623687730.tar.xz
Merge branch 'master' into queuetest
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 4694e2b..e3ed905 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -166,7 +166,11 @@ namespace OpenSim.Region.Framework.Scenes
166 ScenePresence presence = m_scene.GetScenePresence(client.AgentId); 166 ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
167 if (presence == null) 167 if (presence == null)
168 { 168 {
169 m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId); 169 // this shouldn't happen, it basically means that we are prioritizing
170 // updates to send to a client that doesn't have a presence in the scene
171 // seems like there's race condition here...
172
173 // m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId);
170 // throw new InvalidOperationException("Prioritization agent not defined"); 174 // throw new InvalidOperationException("Prioritization agent not defined");
171 return Int32.MaxValue; 175 return Int32.MaxValue;
172 } 176 }