aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs29
1 files changed, 9 insertions, 20 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 43a9d35..282963c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1107,32 +1107,21 @@ namespace OpenSim
1107 /// <param name="cmdparams"></param> 1107 /// <param name="cmdparams"></param>
1108 protected void LoadOar(string module, string[] cmdparams) 1108 protected void LoadOar(string module, string[] cmdparams)
1109 { 1109 {
1110 if (cmdparams.Length > 2) 1110 try
1111 { 1111 {
1112 try 1112 if (cmdparams.Length > 2)
1113 { 1113 {
1114 m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]); 1114 m_sceneManager.LoadArchiveToCurrentScene(cmdparams[2]);
1115 } 1115 }
1116 catch (FileNotFoundException) 1116 else
1117 { 1117 {
1118 m_console.Error("Specified oar file not found."); 1118 m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
1119 }
1120 catch (DirectoryNotFoundException)
1121 {
1122 m_console.Error("Specified directory not found.");
1123 } 1119 }
1124 } 1120 }
1125 else 1121 catch (Exception e)
1126 { 1122 {
1127 try 1123 m_console.Error(e.Message);
1128 { 1124 }
1129 m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
1130 }
1131 catch (FileNotFoundException)
1132 {
1133 m_console.Error("Default oar file not found.");
1134 }
1135 }
1136 } 1125 }
1137 1126
1138 /// <summary> 1127 /// <summary>