diff options
| author | Melanie | 2009-11-25 17:03:11 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-25 17:03:11 +0000 |
| commit | cc3617f74fd857860d4396997f2d3d6a0169db5f (patch) | |
| tree | e33bb44b27ec91dd22f603a074d86cde56c12da4 /OpenSim/Region/Application | |
| parent | Change osTeleportAgent parameters from long to int. That numerical range is (diff) | |
| parent | minor: add doc to a few parcel methods (diff) | |
| download | opensim-SC-cc3617f74fd857860d4396997f2d3d6a0169db5f.zip opensim-SC-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.gz opensim-SC-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.bz2 opensim-SC-cc3617f74fd857860d4396997f2d3d6a0169db5f.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/HGCommands.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/HGCommands.cs b/OpenSim/Region/Application/HGCommands.cs index f503db7..7ae161d 100644 --- a/OpenSim/Region/Application/HGCommands.cs +++ b/OpenSim/Region/Application/HGCommands.cs | |||
| @@ -42,7 +42,7 @@ namespace OpenSim | |||
| 42 | { | 42 | { |
| 43 | public class HGCommands | 43 | public class HGCommands |
| 44 | { | 44 | { |
| 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 46 | 46 | ||
| 47 | public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, CommunicationsManager m_commsManager, | 47 | public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, CommunicationsManager m_commsManager, |
| 48 | StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version) | 48 | StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version) |
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", |