Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 8f8124e..c754019 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
                         {
                             if (client is LLClientView)
                             {
-                                bool isChild = scene.PresenceChildStatus(client.AgentId);
+                                bool isChild = client.SceneAgent.IsChildAgent;
                                 if (isChild && !showChildren)
                                     return;
                         
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
                         {
                             if (client is IStatsCollector)
                             {
-                                bool isChild = scene.PresenceChildStatus(client.AgentId);
+                                bool isChild = client.SceneAgent.IsChildAgent;
                                 if (isChild && !showChildren)
                                     return;
                         
@@ -404,7 +404,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
                                     firstClient = false;
                                 }
 
-                                bool isChild = scene.PresenceChildStatus(client.AgentId);
+                                bool isChild = client.SceneAgent.IsChildAgent;
                                 if (isChild && !showChildren)
                                     return;