diff options
author | Justin Clarke Casey | 2009-05-18 18:22:15 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-18 18:22:15 +0000 |
commit | 29671fc103b0621c57ee87d7479fc69c7a953b32 (patch) | |
tree | 36a20ccb053cf4bf0420e8b97167617d9d07ff75 /OpenSim/Region/Application | |
parent | * Re-enable save oar test by loading asset data plugins from test mock class (diff) | |
download | opensim-SC_OLD-29671fc103b0621c57ee87d7479fc69c7a953b32.zip opensim-SC_OLD-29671fc103b0621c57ee87d7479fc69c7a953b32.tar.gz opensim-SC_OLD-29671fc103b0621c57ee87d7479fc69c7a953b32.tar.bz2 opensim-SC_OLD-29671fc103b0621c57ee87d7479fc69c7a953b32.tar.xz |
* Resolve http://opensimulator.org/mantis/view.php?id=3191
* Catch directory exception on load oar as well as file exception
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 2115b75..43a9d35 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -1115,7 +1115,11 @@ namespace OpenSim | |||
1115 | } | 1115 | } |
1116 | catch (FileNotFoundException) | 1116 | catch (FileNotFoundException) |
1117 | { | 1117 | { |
1118 | m_console.Error("Specified oar not found. Usage: load oar <filename>"); | 1118 | m_console.Error("Specified oar file not found."); |
1119 | } | ||
1120 | catch (DirectoryNotFoundException) | ||
1121 | { | ||
1122 | m_console.Error("Specified directory not found."); | ||
1119 | } | 1123 | } |
1120 | } | 1124 | } |
1121 | else | 1125 | else |
@@ -1126,8 +1130,8 @@ namespace OpenSim | |||
1126 | } | 1130 | } |
1127 | catch (FileNotFoundException) | 1131 | catch (FileNotFoundException) |
1128 | { | 1132 | { |
1129 | m_console.Error("Default oar not found. Usage: load oar <filename>"); | 1133 | m_console.Error("Default oar file not found."); |
1130 | } | 1134 | } |
1131 | } | 1135 | } |
1132 | } | 1136 | } |
1133 | 1137 | ||