diff options
| author | Justin Clark-Casey (justincc) | 2009-11-25 16:14:08 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-25 16:14:08 +0000 |
| commit | a4d2a97bc6ead3aeba4e1be419d976925e5ee470 (patch) | |
| tree | af1247d02ca2aeca85e9ee2815f35cd7b1249244 /OpenSim/Region/Application/OpenSim.cs | |
| parent | Implement oar merging (diff) | |
| download | opensim-SC-a4d2a97bc6ead3aeba4e1be419d976925e5ee470.zip opensim-SC-a4d2a97bc6ead3aeba4e1be419d976925e5ee470.tar.gz opensim-SC-a4d2a97bc6ead3aeba4e1be419d976925e5ee470.tar.bz2 opensim-SC-a4d2a97bc6ead3aeba4e1be419d976925e5ee470.tar.xz | |
minor: remove some mono compiler warnings, add --merge load oar switch to help information
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index f9be1e2..5228e4b 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -232,7 +232,7 @@ namespace OpenSim | |||
| 232 | "Save named prim to XML2", SavePrimsXml2); | 232 | "Save named prim to XML2", SavePrimsXml2); |
| 233 | 233 | ||
| 234 | m_console.Commands.AddCommand("region", false, "load oar", | 234 | m_console.Commands.AddCommand("region", false, "load oar", |
| 235 | "load oar <oar name>", | 235 | "load oar [--merge] <oar name>", |
| 236 | "Load a region's data from OAR archive", LoadOar); | 236 | "Load a region's data from OAR archive", LoadOar); |
| 237 | 237 | ||
| 238 | m_console.Commands.AddCommand("region", false, "save oar", | 238 | m_console.Commands.AddCommand("region", false, "save oar", |