diff options
| author | Melanie | 2013-06-23 01:49:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:49:45 +0100 |
| commit | 936700bda3969bc54166f0d6a3ca81e3d5c42935 (patch) | |
| tree | 6bb97abf25f4a3f22ccb40e3b4be20c551327b09 /OpenSim/Region/Application/OpenSim.cs | |
| parent | Fix prim locking to behave like SL (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-936700bda3969bc54166f0d6a3ca81e3d5c42935.zip opensim-SC-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.gz opensim-SC-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.bz2 opensim-SC-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 11dd052..9325b12 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -372,7 +372,7 @@ namespace OpenSim | |||
| 372 | "Unload a module", HandleModules); | 372 | "Unload a module", HandleModules); |
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | public override void ShutdownSpecific() | 375 | protected override void ShutdownSpecific() |
| 376 | { | 376 | { |
| 377 | if (m_shutdownCommandsFile != String.Empty) | 377 | if (m_shutdownCommandsFile != String.Empty) |
| 378 | { | 378 | { |