diff options
| author | Diva Canto | 2012-03-15 20:22:59 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-15 20:22:59 -0700 |
| commit | 05bb2e42757078737944d2f3179b0b964ae460c8 (patch) | |
| tree | 188e53afb08a96f07996e7d4c0e2dd2db3518096 /OpenSim/Framework/Util.cs | |
| parent | More on map search: send extra messages to the user regarding the region bein... (diff) | |
| parent | Add process working memory to "show stats" memory statistics. (diff) | |
| download | opensim-SC_OLD-05bb2e42757078737944d2f3179b0b964ae460c8.zip opensim-SC_OLD-05bb2e42757078737944d2f3179b0b964ae460c8.tar.gz opensim-SC_OLD-05bb2e42757078737944d2f3179b0b964ae460c8.tar.bz2 opensim-SC_OLD-05bb2e42757078737944d2f3179b0b964ae460c8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index efa4a7b..31fa101 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -81,12 +81,15 @@ namespace OpenSim.Framework | |||
| 81 | 81 | ||
| 82 | private static uint nextXferID = 5000; | 82 | private static uint nextXferID = 5000; |
| 83 | private static Random randomClass = new Random(); | 83 | private static Random randomClass = new Random(); |
| 84 | |||
| 84 | // Get a list of invalid file characters (OS dependent) | 85 | // Get a list of invalid file characters (OS dependent) |
| 85 | private static string regexInvalidFileChars = "[" + new String(Path.GetInvalidFileNameChars()) + "]"; | 86 | private static string regexInvalidFileChars = "[" + new String(Path.GetInvalidFileNameChars()) + "]"; |
| 86 | private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]"; | 87 | private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]"; |
| 87 | private static object XferLock = new object(); | 88 | private static object XferLock = new object(); |
| 88 | /// <summary>Thread pool used for Util.FireAndForget if | 89 | |
| 89 | /// FireAndForgetMethod.SmartThreadPool is used</summary> | 90 | /// <summary> |
| 91 | /// Thread pool used for Util.FireAndForget if FireAndForgetMethod.SmartThreadPool is used | ||
| 92 | /// </summary> | ||
| 90 | private static SmartThreadPool m_ThreadPool; | 93 | private static SmartThreadPool m_ThreadPool; |
| 91 | 94 | ||
| 92 | // Unix-epoch starts at January 1st 1970, 00:00:00 UTC. And all our times in the server are (or at least should be) in UTC. | 95 | // Unix-epoch starts at January 1st 1970, 00:00:00 UTC. And all our times in the server are (or at least should be) in UTC. |