diff options
author | Justin Clark-Casey (justincc) | 2009-11-24 17:28:38 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-24 17:28:38 +0000 |
commit | 88ead9ee63fe87b16d7c24b3a38bf6567f3166f6 (patch) | |
tree | 950bc1123bba17a0583076fc0c6a5009028211e9 /OpenSim/Region/Application/OpenSim.cs | |
parent | minor: remove experimental tags from load iar and save iar commands (diff) | |
download | opensim-SC_OLD-88ead9ee63fe87b16d7c24b3a38bf6567f3166f6.zip opensim-SC_OLD-88ead9ee63fe87b16d7c24b3a38bf6567f3166f6.tar.gz opensim-SC_OLD-88ead9ee63fe87b16d7c24b3a38bf6567f3166f6.tar.bz2 opensim-SC_OLD-88ead9ee63fe87b16d7c24b3a38bf6567f3166f6.tar.xz |
pass all command parameters to load/save oar, not just the filename
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 60c34df..f9be1e2 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -1294,14 +1294,7 @@ namespace OpenSim | |||
1294 | { | 1294 | { |
1295 | try | 1295 | try |
1296 | { | 1296 | { |
1297 | if (cmdparams.Length > 2) | 1297 | m_sceneManager.LoadArchiveToCurrentScene(cmdparams); |
1298 | { | ||
1299 | m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); | ||
1300 | } | ||
1301 | else | ||
1302 | { | ||
1303 | m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); | ||
1304 | } | ||
1305 | } | 1298 | } |
1306 | catch (Exception e) | 1299 | catch (Exception e) |
1307 | { | 1300 | { |
@@ -1315,14 +1308,7 @@ namespace OpenSim | |||
1315 | /// <param name="cmdparams"></param> | 1308 | /// <param name="cmdparams"></param> |
1316 | protected void SaveOar(string module, string[] cmdparams) | 1309 | protected void SaveOar(string module, string[] cmdparams) |
1317 | { | 1310 | { |
1318 | if (cmdparams.Length > 2) | 1311 | m_sceneManager.SaveCurrentSceneToArchive(cmdparams); |
1319 | { | ||
1320 | m_sceneManager.SaveCurrentSceneToArchive(cmdparams[2]); | ||
1321 | } | ||
1322 | else | ||
1323 | { | ||
1324 | m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); | ||
1325 | } | ||
1326 | } | 1312 | } |
1327 | 1313 | ||
1328 | private static string CombineParams(string[] commandParams, int pos) | 1314 | private static string CombineParams(string[] commandParams, int pos) |