diff options
author | Melanie | 2011-11-02 23:51:48 +0000 |
---|---|---|
committer | Melanie | 2011-11-02 23:51:48 +0000 |
commit | e746840226ca56a87d597c899f7c0bd8cf2980b2 (patch) | |
tree | 3eb405e222426a8d51dd9274275673ef34780a48 /OpenSim/Region/CoreModules/Avatar | |
parent | Port the Avination offline messaging system to Core (diff) | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
download | opensim-SC_OLD-e746840226ca56a87d597c899f7c0bd8cf2980b2.zip opensim-SC_OLD-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.gz opensim-SC_OLD-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.bz2 opensim-SC_OLD-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 236a47c..07d1cb3 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -169,6 +169,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
169 | 169 | ||
170 | public bool SendAppearance(UUID agentId) | 170 | public bool SendAppearance(UUID agentId) |
171 | { | 171 | { |
172 | // m_log.DebugFormat("[AVFACTORY]: Sending appearance for {0}", agentId); | ||
173 | |||
172 | ScenePresence sp = m_scene.GetScenePresence(agentId); | 174 | ScenePresence sp = m_scene.GetScenePresence(agentId); |
173 | if (sp == null) | 175 | if (sp == null) |
174 | { | 176 | { |
@@ -257,7 +259,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
257 | /// </summary> | 259 | /// </summary> |
258 | public void QueueAppearanceSend(UUID agentid) | 260 | public void QueueAppearanceSend(UUID agentid) |
259 | { | 261 | { |
260 | // m_log.WarnFormat("[AVFACTORY]: Queue appearance send for {0}", agentid); | 262 | // m_log.DebugFormat("[AVFACTORY]: Queue appearance send for {0}", agentid); |
261 | 263 | ||
262 | // 10000 ticks per millisecond, 1000 milliseconds per second | 264 | // 10000 ticks per millisecond, 1000 milliseconds per second |
263 | long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 1000 * 10000); | 265 | long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 1000 * 10000); |
@@ -393,10 +395,17 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
393 | Dictionary<UUID, long> sends = new Dictionary<UUID, long>(m_sendqueue); | 395 | Dictionary<UUID, long> sends = new Dictionary<UUID, long>(m_sendqueue); |
394 | foreach (KeyValuePair<UUID, long> kvp in sends) | 396 | foreach (KeyValuePair<UUID, long> kvp in sends) |
395 | { | 397 | { |
396 | if (kvp.Value < now) | 398 | // We have to load the key and value into local parameters to avoid a race condition if we loop |
399 | // around and load kvp with a different value before FireAndForget has launched its thread. | ||
400 | UUID avatarID = kvp.Key; | ||
401 | long sendTime = kvp.Value; | ||
402 | |||
403 | // m_log.DebugFormat("[AVFACTORY]: Handling queued appearance updates for {0}, update delta to now is {1}", avatarID, sendTime - now); | ||
404 | |||
405 | if (sendTime < now) | ||
397 | { | 406 | { |
398 | Util.FireAndForget(delegate(object o) { SendAppearance(kvp.Key); }); | 407 | Util.FireAndForget(o => SendAppearance(avatarID)); |
399 | m_sendqueue.Remove(kvp.Key); | 408 | m_sendqueue.Remove(avatarID); |
400 | } | 409 | } |
401 | } | 410 | } |
402 | } | 411 | } |
@@ -406,10 +415,15 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
406 | Dictionary<UUID, long> saves = new Dictionary<UUID, long>(m_savequeue); | 415 | Dictionary<UUID, long> saves = new Dictionary<UUID, long>(m_savequeue); |
407 | foreach (KeyValuePair<UUID, long> kvp in saves) | 416 | foreach (KeyValuePair<UUID, long> kvp in saves) |
408 | { | 417 | { |
409 | if (kvp.Value < now) | 418 | // We have to load the key and value into local parameters to avoid a race condition if we loop |
419 | // around and load kvp with a different value before FireAndForget has launched its thread. | ||
420 | UUID avatarID = kvp.Key; | ||
421 | long sendTime = kvp.Value; | ||
422 | |||
423 | if (sendTime < now) | ||
410 | { | 424 | { |
411 | Util.FireAndForget(delegate(object o) { SaveAppearance(kvp.Key); }); | 425 | Util.FireAndForget(o => SaveAppearance(avatarID)); |
412 | m_savequeue.Remove(kvp.Key); | 426 | m_savequeue.Remove(avatarID); |
413 | } | 427 | } |
414 | } | 428 | } |
415 | } | 429 | } |