diff options
| author | Melanie | 2010-04-19 07:00:40 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-19 07:00:40 +0100 |
| commit | 98cb4f74b265dfb8ca3eb8c8d3ad604249398df1 (patch) | |
| tree | 1339d3707430a20662bdcd3eb4e9ef86abc6a4fd /OpenSim/Region/Application/OpenSim.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | All scripts are now created suspended and are only unsuspended when the object (diff) | |
| download | opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.zip opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.gz opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.bz2 opensim-SC-98cb4f74b265dfb8ca3eb8c8d3ad604249398df1.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
| -rw-r--r--[-rwxr-xr-x] | OpenSim/Region/Application/OpenSim.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 38b2084..1395030 100755..100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -251,8 +251,9 @@ namespace OpenSim | |||
| 251 | "Save named prim to XML2", SavePrimsXml2); | 251 | "Save named prim to XML2", SavePrimsXml2); |
| 252 | 252 | ||
| 253 | m_console.Commands.AddCommand("region", false, "load oar", | 253 | m_console.Commands.AddCommand("region", false, "load oar", |
| 254 | "load oar [--merge] <oar name>", | 254 | "load oar [--merge] [--skip-assets] <oar name>", |
| 255 | "Load a region's data from OAR archive", LoadOar); | 255 | "Load a region's data from OAR archive. --merge will merge the oar with the existing scene. --skip-assets will load the oar but ignore the assets it contains", |
| 256 | LoadOar); | ||
| 256 | 257 | ||
| 257 | m_console.Commands.AddCommand("region", false, "save oar", | 258 | m_console.Commands.AddCommand("region", false, "save oar", |
| 258 | "save oar <oar name>", | 259 | "save oar <oar name>", |