diff options
| author | BlueWall | 2011-12-02 18:57:57 -0500 |
|---|---|---|
| committer | BlueWall | 2011-12-02 18:57:57 -0500 |
| commit | 21f4ee8a3d3712b44514080fa284ca36c8a1196d (patch) | |
| tree | a6200d79186597f15adaf2b3582390a1a4b2d415 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Make fix to Nini for null references in some cases. (diff) | |
| parent | Stop some places where we're trying to reset animations in child agents where... (diff) | |
| download | opensim-SC-21f4ee8a3d3712b44514080fa284ca36c8a1196d.zip opensim-SC-21f4ee8a3d3712b44514080fa284ca36c8a1196d.tar.gz opensim-SC-21f4ee8a3d3712b44514080fa284ca36c8a1196d.tar.bz2 opensim-SC-21f4ee8a3d3712b44514080fa284ca36c8a1196d.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9a71cd4..3ac6327 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3700,7 +3700,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3700 | return false; | 3700 | return false; |
| 3701 | } | 3701 | } |
| 3702 | 3702 | ||
| 3703 | |||
| 3704 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 3703 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
| 3705 | 3704 | ||
| 3706 | if (childAgentUpdate != null) | 3705 | if (childAgentUpdate != null) |