diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/Application/OpenSim.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index d7a4944..f070812 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -1245,20 +1245,20 @@ namespace OpenSim | |||
| 1245 | protected void LoadOar(string module, string[] cmdparams) | 1245 | protected void LoadOar(string module, string[] cmdparams) |
| 1246 | { | 1246 | { |
| 1247 | try | 1247 | try |
| 1248 | { | 1248 | { |
| 1249 | if (cmdparams.Length > 2) | 1249 | if (cmdparams.Length > 2) |
| 1250 | { | 1250 | { |
| 1251 | m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); | 1251 | m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); |
| 1252 | } | 1252 | } |
| 1253 | else | 1253 | else |
| 1254 | { | 1254 | { |
| 1255 | m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); | 1255 | m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); |
| 1256 | } | 1256 | } |
| 1257 | } | 1257 | } |
| 1258 | catch (Exception e) | 1258 | catch (Exception e) |
| 1259 | { | 1259 | { |
| 1260 | m_log.Error(e.Message); | 1260 | m_log.Error(e.Message); |
| 1261 | } | 1261 | } |
| 1262 | } | 1262 | } |
| 1263 | 1263 | ||
| 1264 | /// <summary> | 1264 | /// <summary> |