diff options
| author | Melanie | 2012-06-08 00:43:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-08 00:43:39 +0100 |
| commit | 48add77a4c985858794c2c3a9d7ea63a31921528 (patch) | |
| tree | 7757e425e3d9e93d742c51e3f39bee57be04546b /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Go back to calling IncomingCloseAgent() in the "kick user" command for consis... (diff) | |
| download | opensim-SC-48add77a4c985858794c2c3a9d7ea63a31921528.zip opensim-SC-48add77a4c985858794c2c3a9d7ea63a31921528.tar.gz opensim-SC-48add77a4c985858794c2c3a9d7ea63a31921528.tar.bz2 opensim-SC-48add77a4c985858794c2c3a9d7ea63a31921528.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index a62c1ac..4c12496 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -782,12 +782,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 782 | 782 | ||
| 783 | public int GetChildAgentCount() | 783 | public int GetChildAgentCount() |
| 784 | { | 784 | { |
| 785 | // some network situations come in where child agents get closed twice. | ||
| 786 | if (m_numChildAgents < 0) | ||
| 787 | { | ||
| 788 | m_numChildAgents = 0; | ||
| 789 | } | ||
| 790 | |||
| 791 | return m_numChildAgents; | 785 | return m_numChildAgents; |
| 792 | } | 786 | } |
| 793 | 787 | ||