diff options
| author | Melanie | 2012-01-26 00:21:21 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 00:21:21 +0000 |
| commit | 4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf (patch) | |
| tree | 6173c8da92084547e89db40e5762a74249b4a8db /OpenSim/Region/Application | |
| parent | Typo fix (diff) | |
| parent | refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento... (diff) | |
| download | opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.zip opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.gz opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.bz2 opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 515567d..c4f7b91 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -291,10 +291,10 @@ namespace OpenSim | |||
| 291 | 291 | ||
| 292 | m_console.Commands.AddCommand("region", false, "save oar", | 292 | m_console.Commands.AddCommand("region", false, "save oar", |
| 293 | //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]", | 293 | //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]", |
| 294 | "save oar [-p|--profile=<url>] [--noassets] [--perm=<permissions>] [<OAR path>]", | 294 | "save oar [-h|--home=<url>] [--noassets] [--perm=<permissions>] [<OAR path>]", |
| 295 | "Save a region's data to an OAR archive.", | 295 | "Save a region's data to an OAR archive.", |
| 296 | // "-v|--version=<N> generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine | 296 | // "-v|--version=<N> generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine |
| 297 | "-p|--profile=<url> adds the url of the profile service to the saved user information." + Environment.NewLine | 297 | "-h|--home=<url> adds the url of the profile service to the saved user information." + Environment.NewLine |
| 298 | + "--noassets stops assets being saved to the OAR." + Environment.NewLine | 298 | + "--noassets stops assets being saved to the OAR." + Environment.NewLine |
| 299 | + "--perm stops objects with insufficient permissions from being saved to the OAR." + Environment.NewLine | 299 | + "--perm stops objects with insufficient permissions from being saved to the OAR." + Environment.NewLine |
| 300 | + " <permissions> can contain one or more of these characters: \"C\" = Copy, \"T\" = Transfer" + Environment.NewLine | 300 | + " <permissions> can contain one or more of these characters: \"C\" = Copy, \"T\" = Transfer" + Environment.NewLine |