diff options
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index d27beff..5e7420b 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -1007,7 +1007,7 @@ namespace OpenSim | |||
1007 | { | 1007 | { |
1008 | m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset); | 1008 | m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset); |
1009 | } | 1009 | } |
1010 | catch | 1010 | catch (FileNotFoundException) |
1011 | { | 1011 | { |
1012 | m_console.Error("Default xml not found. Usage: load-xml <filename>"); | 1012 | m_console.Error("Default xml not found. Usage: load-xml <filename>"); |
1013 | } | 1013 | } |
@@ -1018,14 +1018,7 @@ namespace OpenSim | |||
1018 | { | 1018 | { |
1019 | if (cmdparams.Length > 2) | 1019 | if (cmdparams.Length > 2) |
1020 | { | 1020 | { |
1021 | try | 1021 | m_sceneManager.SaveCurrentSceneToXml2(cmdparams[2]); |
1022 | { | ||
1023 | m_sceneManager.SaveCurrentSceneToXml2(cmdparams[2]); | ||
1024 | } | ||
1025 | catch | ||
1026 | { | ||
1027 | m_console.Error("Unable to save xml. Usage: save xml2 <filename>"); | ||
1028 | } | ||
1029 | } | 1022 | } |
1030 | else | 1023 | else |
1031 | { | 1024 | { |
@@ -1041,7 +1034,7 @@ namespace OpenSim | |||
1041 | { | 1034 | { |
1042 | m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]); | 1035 | m_sceneManager.LoadCurrentSceneFromXml2(cmdparams[2]); |
1043 | } | 1036 | } |
1044 | catch | 1037 | catch (FileNotFoundException) |
1045 | { | 1038 | { |
1046 | m_console.Error("Specified xml not found. Usage: load xml2 <filename>"); | 1039 | m_console.Error("Specified xml not found. Usage: load xml2 <filename>"); |
1047 | } | 1040 | } |
@@ -1052,7 +1045,7 @@ namespace OpenSim | |||
1052 | { | 1045 | { |
1053 | m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); | 1046 | m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME); |
1054 | } | 1047 | } |
1055 | catch | 1048 | catch (FileNotFoundException) |
1056 | { | 1049 | { |
1057 | m_console.Error("Default xml not found. Usage: load xml2 <filename>"); | 1050 | m_console.Error("Default xml not found. Usage: load xml2 <filename>"); |
1058 | } | 1051 | } |
@@ -1071,7 +1064,7 @@ namespace OpenSim | |||
1071 | { | 1064 | { |
1072 | m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); | 1065 | m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); |
1073 | } | 1066 | } |
1074 | catch | 1067 | catch (FileNotFoundException) |
1075 | { | 1068 | { |
1076 | m_console.Error("Specified oar not found. Usage: load oar <filename>"); | 1069 | m_console.Error("Specified oar not found. Usage: load oar <filename>"); |
1077 | } | 1070 | } |
@@ -1082,7 +1075,7 @@ namespace OpenSim | |||
1082 | { | 1075 | { |
1083 | m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); | 1076 | m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME); |
1084 | } | 1077 | } |
1085 | catch | 1078 | catch (FileNotFoundException) |
1086 | { | 1079 | { |
1087 | m_console.Error("Default oar not found. Usage: load oar <filename>"); | 1080 | m_console.Error("Default oar not found. Usage: load oar <filename>"); |
1088 | } | 1081 | } |
@@ -1097,14 +1090,7 @@ namespace OpenSim | |||
1097 | { | 1090 | { |
1098 | if (cmdparams.Length > 2) | 1091 | if (cmdparams.Length > 2) |
1099 | { | 1092 | { |
1100 | try | 1093 | m_sceneManager.SaveCurrentSceneToArchive(cmdparams[2]); |
1101 | { | ||
1102 | m_sceneManager.SaveCurrentSceneToArchive(cmdparams[2]); | ||
1103 | } | ||
1104 | catch | ||
1105 | { | ||
1106 | m_console.Error("Unable to save oar. Usage: save oar <filename>"); | ||
1107 | } | ||
1108 | } | 1094 | } |
1109 | else | 1095 | else |
1110 | { | 1096 | { |