diff --git a/Programs/examples/TestClient/Commands/Inventory/TaskRunningCommand.cs b/Programs/examples/TestClient/Commands/Inventory/TaskRunningCommand.cs
new file mode 100644
index 00000000..f0284ecc
--- /dev/null
+++ b/Programs/examples/TestClient/Commands/Inventory/TaskRunningCommand.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using OpenMetaverse;
+
+namespace OpenMetaverse.TestClient
+{
+    public class TaskRunningCommand : Command
+    {
+        public TaskRunningCommand(TestClient testClient)
+        {
+            Name = "taskrunning";
+            Description = "Retrieves or set IsRunning flag on items inside an object (task inventory). Usage: taskrunning objectID [[scriptName] true|false]";
+            Category = CommandCategory.Inventory;
+        }
+
+        public override string Execute(string[] args, UUID fromAgentID)
+        {
+            if (args.Length != 1)
+                return "Usage: taskrunning objectID [[scriptName] true|false]";
+
+            uint objectLocalID;
+            UUID objectID;
+
+            if (!UUID.TryParse(args[0], out objectID))
+                return "Usage: taskrunning objectID [[scriptName] true|false]";
+
+            Primitive found = Client.Network.CurrentSim.ObjectsPrimitives.Find(delegate(Primitive prim) { return prim.ID == objectID; });
+            if (found != null)
+                objectLocalID = found.LocalID;
+            else
+                return String.Format("Couldn't find prim {0}", objectID);
+
+            List<InventoryBase> items = Client.Inventory.GetTaskInventory(objectID, objectLocalID, 1000 * 30);
+
+            bool wantSet = false;
+            bool setTaskTo = false;
+            if (items != null)
+            {
+                string result = String.Empty;
+                string matching = String.Empty;
+                bool setAny = false;
+                if (args.Length > 1)
+                {
+                    matching = args[1];
+
+                    string tf;
+                    if (args.Length > 2)
+                    {
+                        tf = args[2];
+                    }
+                    else
+                    {
+                        tf = matching.ToLower();
+                    }
+                    if (tf == "true")
+                    {
+                        setAny = true;
+                        setTaskTo = true;
+                    }
+                    else if (tf == "false")
+                    {
+                        setAny = true;
+                        setTaskTo = false;
+                    }
+
+                }
+                bool wasRunning = false;
+
+                InventoryManager.ScriptRunningCallback callback;
+                using (AutoResetEvent OnScriptRunningReset = new AutoResetEvent(false))
+                {
+                    callback = ((UUID objectID0, UUID sctriptID, bool isMono, bool isRunning) =>
+                    {
+                        if (objectID0 == objectID)
+                        {
+                            result += String.Format(" IsMono: {0} IsRunning: {1}", isMono, isRunning);
+                            wasRunning = isRunning;
+                            OnScriptRunningReset.Set();
+                        }
+                    });
+
+                    Client.Inventory.OnScriptRunning += callback;
+
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        if (items[i] is InventoryFolder)
+                        {
+                            // this shouldn't happen this year
+                            result += String.Format("[Folder] Name: {0}", items[i].Name) + Environment.NewLine;
+                        }
+                        else
+                        {
+                            InventoryItem item = (InventoryItem)items[i];
+                            AssetType assetType = item.AssetType;
+                            result += String.Format("[Item] Name: {0} Desc: {1} Type: {2}", item.Name, item.Description,
+                                                    assetType);
+                            if (assetType == AssetType.LSLBytecode || assetType == AssetType.LSLText)
+                            {
+                                OnScriptRunningReset.Reset();
+                                Client.Inventory.GetScriptRunning(objectID, item.UUID);
+                                if (!OnScriptRunningReset.WaitOne(10000, true))
+                                {
+                                    result += " (no script info)";
+                                }
+                                if (setAny && item.Name.Contains(matching))
+                                {
+                                    if (wasRunning != setTaskTo)
+                                    {
+                                        OnScriptRunningReset.Reset();
+                                        result += " Setting " + setTaskTo + " => ";
+                                        Client.Inventory.SetScriptRunning(objectID, item.UUID, setTaskTo);
+                                        if (!OnScriptRunningReset.WaitOne(10000, true))
+                                        {
+                                            result += " (was not set)";
+                                        }
+                                    }
+                                }
+                            }
+
+                            result += Environment.NewLine;
+                        }
+                    }
+                }
+                Client.Inventory.OnScriptRunning -= callback;
+                return result;
+            }
+            else
+            {
+                return "Failed to download task inventory for " + objectLocalID;
+            }
+        }
+    }
+}