diff options
| author | Melanie | 2012-02-19 21:14:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-19 21:14:18 +0000 |
| commit | 756baff86a751a96e485b218b21c472b704f430b (patch) | |
| tree | 9e59a0b0df7f5ba2a9ab15a0d25fda6aa7fb4142 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-756baff86a751a96e485b218b21c472b704f430b.zip opensim-SC-756baff86a751a96e485b218b21c472b704f430b.tar.gz opensim-SC-756baff86a751a96e485b218b21c472b704f430b.tar.bz2 opensim-SC-756baff86a751a96e485b218b21c472b704f430b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 429fc06..db1a9d5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2777,7 +2777,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2777 | AgentPosition agentpos = new AgentPosition(); | 2777 | AgentPosition agentpos = new AgentPosition(); |
| 2778 | agentpos.CopyFrom(cadu); | 2778 | agentpos.CopyFrom(cadu); |
| 2779 | 2779 | ||
| 2780 | m_scene.SendOutChildAgentUpdates(agentpos, this); | 2780 | // Let's get this out of the update loop |
| 2781 | Util.FireAndForget(delegate { m_scene.SendOutChildAgentUpdates(agentpos, this); }); | ||
| 2781 | } | 2782 | } |
| 2782 | } | 2783 | } |
| 2783 | 2784 | ||