diff options
| author | Melanie | 2010-12-07 01:07:57 +0100 |
|---|---|---|
| committer | Melanie | 2010-12-07 01:07:57 +0100 |
| commit | b325721d6f8e5915b2c77a76c9ed14e15a4e1645 (patch) | |
| tree | d67b6bc610c0651e1e58225fdf7ae8fe11995d62 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Cowardly refuse to keep running when no application plugins are loaded. (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-b325721d6f8e5915b2c77a76c9ed14e15a4e1645.zip opensim-SC-b325721d6f8e5915b2c77a76c9ed14e15a4e1645.tar.gz opensim-SC-b325721d6f8e5915b2c77a76c9ed14e15a4e1645.tar.bz2 opensim-SC-b325721d6f8e5915b2c77a76c9ed14e15a4e1645.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 792115a..e48b92b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3826,6 +3826,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3826 | } | 3826 | } |
| 3827 | 3827 | ||
| 3828 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 3828 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
| 3829 | |||
| 3829 | if (childAgentUpdate != null) | 3830 | if (childAgentUpdate != null) |
| 3830 | { | 3831 | { |
| 3831 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); | 3832 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); |