* Apply http://opensimulator.org/mantis/view.php?id=2482

* Stop 'show threads' throwing an exception if a thread is dead

1 files changed, 17 insertions, 3 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index f5e5c18..499b2f8 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -141,9 +141,23 @@ namespace OpenSim.Framework.Servers
                 sb.Append(threads.Count + " threads are being tracked:" + Environment.NewLine);
                 foreach (Thread t in threads)
                 {
-                    sb.Append(
-                        "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive
-                        + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine);
+                    if (t.IsAlive)
+                    {
+                        sb.Append(
+                            "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive
+                            + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine);
+                    }
+                    else
+                    {
+                        try
+                        {
+                            sb.Append("ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", DEAD" + Environment.NewLine);
+                        }
+                        catch (Exception e)
+                        {
+                            sb.Append("THREAD ERROR" + Environment.NewLine);
+                        }
+                    }
                 }
             }