diff options
| author | UbitUmarov | 2018-01-16 19:12:19 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-01-16 19:12:19 +0000 |
| commit | c35803964f3ea0f59ec12095558f2bf03a066b16 (patch) | |
| tree | 1d888dd76f4498146f0365af2757635d9b1d1619 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Ooops... fix the parentesis (diff) | |
| download | opensim-SC-c35803964f3ea0f59ec12095558f2bf03a066b16.zip opensim-SC-c35803964f3ea0f59ec12095558f2bf03a066b16.tar.gz opensim-SC-c35803964f3ea0f59ec12095558f2bf03a066b16.tar.bz2 opensim-SC-c35803964f3ea0f59ec12095558f2bf03a066b16.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework')
| -rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6497444..15a0493 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1943,7 +1943,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1943 | { | 1943 | { |
| 1944 | if (!m_backingup) | 1944 | if (!m_backingup) |
| 1945 | { | 1945 | { |
| 1946 | WorkManager.RunInThreadPool(o => Backup(false), null, string.Format("BackupWorker ({0})", Name, false)); | 1946 | WorkManager.RunInThreadPool(o => Backup(false), null, string.Format("BackupWorker ({0}", Name), false); |
| 1947 | } | 1947 | } |
| 1948 | } | 1948 | } |
| 1949 | 1949 | ||