1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 7bd16e6..4fec91f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -770,8 +770,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             foreach (ScenePresence sp in Scene.GetScenePresences())
             {
-                LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
-                total += udpClient.GetTotalPacketsQueuedCount();
+                // XXX: Need a better way to determine which IClientAPIs have UDPClients (NPCs do not, for instance).
+                if (sp.ControllingClient is LLClientView)
+                {
+                    LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient;
+                    total += udpClient.GetTotalPacketsQueuedCount();
+                }
             }
 
             return total;