diff options
author | Justin Clark-Casey (justincc) | 2010-04-16 22:29:11 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-16 22:29:11 +0100 |
commit | bf3956aeb0a44d0dd455e330234fcf0e18f5ea43 (patch) | |
tree | ef98a5c369f1359ee1ebcfd9e90ad945039c9c17 /OpenSim/Region/Application/OpenSim.cs | |
parent | add a missing initialization of the m_memoryCache in XmlRpcGroupsServicesConn... (diff) | |
download | opensim-SC_OLD-bf3956aeb0a44d0dd455e330234fcf0e18f5ea43.zip opensim-SC_OLD-bf3956aeb0a44d0dd455e330234fcf0e18f5ea43.tar.gz opensim-SC_OLD-bf3956aeb0a44d0dd455e330234fcf0e18f5ea43.tar.bz2 opensim-SC_OLD-bf3956aeb0a44d0dd455e330234fcf0e18f5ea43.tar.xz |
Add --skip-assets option to load oar.
This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
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>", |