diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-25 14:13:51 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-25 14:13:51 -0500 |
commit | dac9c6fb2360fd46603e08877d57a704eb02e183 (patch) | |
tree | 614ef8a4851d69a3fb3a76c7839ef576c234b6e7 /OpenSim/Region/Application | |
parent | Patch: Fix a bug in LAND animation when the TickCount wraps into negative num... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.zip opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.gz opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.bz2 opensim-SC_OLD-dac9c6fb2360fd46603e08877d57a704eb02e183.tar.xz |
Merge branch 'master' of ssh://MyConnection/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", |