diff options
| author | Kitto Flora | 2011-03-22 20:33:24 +0000 |
|---|---|---|
| committer | Kitto Flora | 2011-03-22 20:33:24 +0000 |
| commit | 764e8c2a4371c24d1a0bd067c0bcbc806562064d (patch) | |
| tree | 03dfb1bfe16c420fdbb6a1aa723c9203771d1beb /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Add some more fields to Estate settings and make them work. (diff) | |
| download | opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.zip opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.tar.gz opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.tar.bz2 opensim-SC-764e8c2a4371c24d1a0bd067c0bcbc806562064d.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/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 | { |