diff options
author | Justin Clark-Casey (justincc) | 2011-04-14 20:15:34 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-14 20:15:34 +0100 |
commit | 4b05e667cbc2a6b3e41eeac2981a08bc9eabd9be (patch) | |
tree | 7197c2bc461bd7b32ad8a77f4772f03d738ff51f /OpenSim/Region/Framework/Scenes/Prioritizer.cs | |
parent | simplify coalesced object tests by using existing scene object set up utils (diff) | |
parent | Comment out the warning if the prioritizer runs without a fully (diff) | |
download | opensim-SC-4b05e667cbc2a6b3e41eeac2981a08bc9eabd9be.zip opensim-SC-4b05e667cbc2a6b3e41eeac2981a08bc9eabd9be.tar.gz opensim-SC-4b05e667cbc2a6b3e41eeac2981a08bc9eabd9be.tar.bz2 opensim-SC-4b05e667cbc2a6b3e41eeac2981a08bc9eabd9be.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Prioritizer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Prioritizer.cs | 6 |
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 | } |