aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMic Bowman2011-04-10 17:02:40 -0700
committerMic Bowman2011-04-10 17:02:40 -0700
commitebc249e3bef57aee656936f5e63842d83ee29fff (patch)
tree198c3ca25585d2426c926c3199b4410306c0c773 /OpenSim
parentSplit the priority queue class into a seperate file. LLClientView (diff)
downloadopensim-SC_OLD-ebc249e3bef57aee656936f5e63842d83ee29fff.zip
opensim-SC_OLD-ebc249e3bef57aee656936f5e63842d83ee29fff.tar.gz
opensim-SC_OLD-ebc249e3bef57aee656936f5e63842d83ee29fff.tar.bz2
opensim-SC_OLD-ebc249e3bef57aee656936f5e63842d83ee29fff.tar.xz
Changed the "not in scene" check in the prioritizier to just
a warning. There appears to be a race condition on slow logins that attempts to prioritize before the scene presence is fully initialized.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index a14bb70..4694e2b 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -166,8 +166,9 @@ 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 prioritize agent no longer in the scene"); 169 m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId);
170 throw new InvalidOperationException("Prioritization agent not defined"); 170 // throw new InvalidOperationException("Prioritization agent not defined");
171 return Int32.MaxValue;
171 } 172 }
172 173
173 // Use group position for child prims, since we are putting child prims in 174 // Use group position for child prims, since we are putting child prims in