Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs

OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs

@@ -97,6 +97,14 @@ namespace OpenSim.Region.ClientStack.Linden
                     + "  >= 1 - turns on outgoing event logging\n"
                     + "  >= 2 - turns on poll notification",
                 HandleDebugEq);
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Debug",
+                false,
+                "show eq",
+                "show eq",
+                "Show contents of event queues for logged in avatars.  Used for debugging.",
+                HandleShowEq);
         }
 
         public void RemoveRegion(Scene scene)
@@ -138,7 +146,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             if (!(args.Length == 3 && int.TryParse(args[2], out debugLevel)))
             {
-                MainConsole.Instance.OutputFormat("Usage: debug eq [0|1]");
+                MainConsole.Instance.OutputFormat("Usage: debug eq [0|1|2]");
             }
             else
             {
@@ -148,6 +156,21 @@ namespace OpenSim.Region.ClientStack.Linden
             }
         }
 
+        protected void HandleShowEq(string module, string[] args)
+        {
+            MainConsole.Instance.OutputFormat("For scene {0}", m_scene.Name);
+
+            lock (queues)
+            {
+                foreach (KeyValuePair<UUID, Queue<OSD>> kvp in queues)
+                {
+                    MainConsole.Instance.OutputFormat(
+                        "For agent {0} there are {1} messages queued for send.", 
+                        kvp.Key, kvp.Value.Count);
+                }
+            }
+        }
+
         /// <summary>
         ///  Always returns a valid queue
         /// </summary>