Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3095382..85bae9a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3617,10 +3617,9 @@ namespace OpenSim.Region.Framework.Scenes
                 // Or the same user is trying to be root twice here, won't work.
                 // Kill it.
                 m_log.DebugFormat(
-                    "[SCENE]: Zombie scene presence detected for {0} in {1}",
-                    agent.AgentID,
-                    RegionInfo.RegionName
-                );
+                    "[SCENE]: Zombie scene presence detected for {0} {1} in {2}",
+                    sp.Name, sp.UUID, RegionInfo.RegionName);
+
                 sp.ControllingClient.Close();
                 sp = null;
             }