minor: remove some mono compiler warnings, add --merge load oar switch to help information

4 files changed, 7 insertions, 6 deletions

diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs
index e2afd2a..32c0c95 100644
--- a/OpenSim/Framework/Tests/CacheTests.cs
+++ b/OpenSim/Framework/Tests/CacheTests.cs
@@ -78,8 +78,9 @@ namespace OpenSim.Framework.Tests
             foo[0] = 1;
             cachedItem.Store(foo);
             cache.Store(cacheItemUUID.ToString(), cachedItem);
-            
-            object citem = cache.Get(cacheItemUUID.ToString());
+
+            cache.Get(cacheItemUUID.ToString());
+            //object citem = cache.Get(cacheItemUUID.ToString());
             //Assert.That(citem == null, "Item should not be in Cache because the expiry time was before now");
         }
 
@@ -94,7 +95,8 @@ namespace OpenSim.Framework.Tests
             cachedItem.Store(foo);
             cache.Store(cacheItemUUID.ToString(), cachedItem);
             cache.Invalidate(ImmediateExpiryUUID.ToString());
-            object citem = cache.Get(cacheItemUUID.ToString());
+            cache.Get(cacheItemUUID.ToString());
+            //object citem = cache.Get(cacheItemUUID.ToString());
             //Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it");
         }
 
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
 {
     public class HGCommands
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, CommunicationsManager m_commsManager,
             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
                                           "Save named prim to XML2", SavePrimsXml2);
 
             m_console.Commands.AddCommand("region", false, "load oar",
-                                          "load oar <oar name>",
+                                          "load oar [--merge] <oar name>",
                                           "Load a region's data from OAR archive", LoadOar);
 
             m_console.Commands.AddCommand("region", false, "save oar",
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index cd59bdb..f4da910 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -57,7 +57,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         #region ISharedRegionModule Members
         public virtual void Initialise(IConfigSource config)
         {
-
             m_config = config.Configs["Chat"];
 
             if (null == m_config)