diff options
author | UbitUmarov | 2018-01-18 02:40:59 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-18 02:40:59 +0000 |
commit | a6e0ba262a31468c0e65faf27e6b14817d3c1669 (patch) | |
tree | d3de2d46e15b31e3621181c03eed8628fb861f3c | |
parent | NDesk.options .net4.6 (diff) | |
download | opensim-SC-a6e0ba262a31468c0e65faf27e6b14817d3c1669.zip opensim-SC-a6e0ba262a31468c0e65faf27e6b14817d3c1669.tar.gz opensim-SC-a6e0ba262a31468c0e65faf27e6b14817d3c1669.tar.bz2 opensim-SC-a6e0ba262a31468c0e65faf27e6b14817d3c1669.tar.xz |
iStackTrace(targetThread, true) is no longer safe on windoes also
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Util.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index eb24c84..0685fdc 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -2858,6 +2858,12 @@ namespace OpenSim.Framework | |||
2858 | /// <returns>The stack trace, or null if failed to get it</returns> | 2858 | /// <returns>The stack trace, or null if failed to get it</returns> |
2859 | private static StackTrace GetStackTrace(Thread targetThread) | 2859 | private static StackTrace GetStackTrace(Thread targetThread) |
2860 | { | 2860 | { |
2861 | |||
2862 | return null; | ||
2863 | /* | ||
2864 | not only this does not work on mono but it is not longer recomended on windows. | ||
2865 | can cause deadlocks etc. | ||
2866 | |||
2861 | if (IsPlatformMono) | 2867 | if (IsPlatformMono) |
2862 | { | 2868 | { |
2863 | // This doesn't work in Mono | 2869 | // This doesn't work in Mono |
@@ -2920,6 +2926,7 @@ namespace OpenSim.Framework | |||
2920 | // Signal the fallack-thread to stop | 2926 | // Signal the fallack-thread to stop |
2921 | exitedSafely.Set(); | 2927 | exitedSafely.Set(); |
2922 | } | 2928 | } |
2929 | */ | ||
2923 | } | 2930 | } |
2924 | #pragma warning restore 0618 | 2931 | #pragma warning restore 0618 |
2925 | 2932 | ||