diff options
| author | Melanie | 2009-10-22 07:02:21 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-22 07:02:21 +0100 |
| commit | b35fbe1f98532196befa8bc38deb0aba83d08f6f (patch) | |
| tree | 2aa3d6c6e8683dcce52709931c998b7e2bf1d42d /OpenSim/Framework/Servers | |
| parent | * Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to U... (diff) | |
| parent | Make the LSL scripting delays take full effect. To tune, tweat the (diff) | |
| download | opensim-SC-b35fbe1f98532196befa8bc38deb0aba83d08f6f.zip opensim-SC-b35fbe1f98532196befa8bc38deb0aba83d08f6f.tar.gz opensim-SC-b35fbe1f98532196befa8bc38deb0aba83d08f6f.tar.bz2 opensim-SC-b35fbe1f98532196befa8bc38deb0aba83d08f6f.tar.xz | |
Merge branch 'melanie_test' into prioritization
This makes SmartThreadPool configurable and also makes it the default, since
the regular thread pool simply stinks.
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 9f98310..812abd1 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
| @@ -29,7 +29,7 @@ namespace OpenSim | |||
| 29 | { | 29 | { |
| 30 | public class VersionInfo | 30 | public class VersionInfo |
| 31 | { | 31 | { |
| 32 | private const string VERSION_NUMBER = "0.6.8"; | 32 | private const string VERSION_NUMBER = "0.6.8-mel_t"; |
| 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
| 34 | 34 | ||
| 35 | public enum Flavour | 35 | public enum Flavour |