Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge

1 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c91744c..a58b87d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -452,14 +452,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// console.
         /// </summary>
         /// <param name="newDebug"></param>
-        public void SetDebugPacketLevelOnCurrentScene(int newDebug)
+        /// <param name="name">Name of avatar to debug</param>
+        public void SetDebugPacketLevelOnCurrentScene(int newDebug, string name)
         {
             ForEachCurrentScene(
                 delegate(Scene scene)
                 {
                     scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
                     {
-                        if (!scenePresence.IsChildAgent)
+                        if (!scenePresence.IsChildAgent && (name == null || scenePresence.Name == name))
                         {
                             m_log.DebugFormat("Packet debug for {0} {1} set to {2}",
                                               scenePresence.Firstname,