diff options
| author | Melanie | 2011-02-27 19:47:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-27 19:47:37 +0000 |
| commit | 9b277b372be4e1071c02f87a53cb70a4324d77fa (patch) | |
| tree | 35183674cbacc79f2931a9cc11f747974fff845b /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Fix a few little things (diff) | |
| parent | change some log messages from info to debug (diff) | |
| download | opensim-SC_OLD-9b277b372be4e1071c02f87a53cb70a4324d77fa.zip opensim-SC_OLD-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.gz opensim-SC_OLD-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.bz2 opensim-SC_OLD-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 92fe2ab..e8cf4f4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -218,9 +218,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 218 | for (int i = 0; i < Math.Min(presences.Count, maxLocations); ++i) | 218 | for (int i = 0; i < Math.Min(presences.Count, maxLocations); ++i) |
| 219 | { | 219 | { |
| 220 | ScenePresence sp = presences[i]; | 220 | ScenePresence sp = presences[i]; |
| 221 | |||
| 221 | // If this presence is a child agent, we don't want its coarse locations | 222 | // If this presence is a child agent, we don't want its coarse locations |
| 222 | if (sp.IsChildAgent) | 223 | if (sp.IsChildAgent) |
| 223 | return; | 224 | continue; |
| 224 | 225 | ||
| 225 | if (sp.ParentID != 0) | 226 | if (sp.ParentID != 0) |
| 226 | { | 227 | { |