From 6d774339d9c51c1635e96cd92f57a8bc13021e5f Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Fri, 29 Feb 2008 10:51:40 +0000
Subject: More compiler warning cleanup. Removed verbose flag, since it doesn't
 do anything any more.

---
 OpenSim/Region/Application/Application.cs                 | 1 -
 OpenSim/Region/Application/OpenSimMain.cs                 | 5 -----
 OpenSim/Region/Environment/Modules/AssetDownloadModule.cs | 8 +++-----
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0e2608a..6faca1b 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -68,7 +68,6 @@ namespace OpenSim
             configSource.AddSwitch("Startup", "inifile");
             configSource.AddSwitch("Startup", "gridmode");
             configSource.AddSwitch("Startup", "physics");
-            configSource.AddSwitch("Startup", "verbose");
             configSource.AddSwitch("Startup", "useexecutepath");
 
             configSource.AddConfig("StandAlone");
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6e89143..bdefd0f 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -78,7 +78,6 @@ namespace OpenSim
         protected List<UDPServer> m_udpServers = new List<UDPServer>();
         protected List<RegionInfo> m_regionData = new List<RegionInfo>();
 
-        private bool m_verbose;
         private bool m_physicalPrim;
         private bool m_permissions = false;
 
@@ -173,7 +172,6 @@ namespace OpenSim
             {
                 config.Set("gridmode", false);
                 config.Set("physics", "basicphysics");
-                config.Set("verbose", true);
                 config.Set("physical_prim", true);
                 config.Set("see_into_this_sim_from_neighbor", true);
                 config.Set("serverside_object_permissions", false);
@@ -241,9 +239,6 @@ namespace OpenSim
                 m_physicsEngine = startupConfig.GetString("physics", "basicphysics");
                 m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher");
                 
-                // TODO: since log4net changes, verbose flag doesn't do anything
-                m_verbose = startupConfig.GetBoolean("verbose", true);
-
                 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
 
                 m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index f53be41..33c0ce2 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -131,7 +131,6 @@ namespace OpenSim.Region.Environment.Modules
             {
                 if (!userRequests.ContainsKey(requestID))
                 {
-                   
                     AssetRequest request = new AssetRequest();
                     request.RequestUser = userInfo;
                     request.RequestAssetID = requestID;
@@ -154,9 +153,7 @@ namespace OpenSim.Region.Environment.Modules
                 userRequests.Add(requestID, request);
                 RequestedAssets[userInfo.AgentId] = userRequests;
                 m_scene.AssetCache.GetAsset(requestID, AssetCallback, false);
-              
             }
-            return;
         }
 
         public void AssetCallback(LLUUID assetID, AssetBase asset)
@@ -190,7 +187,7 @@ namespace OpenSim.Region.Environment.Modules
                     ProcessAssetQueue();
                     Thread.Sleep(500);
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                   //  m_log.Error("[ASSET CACHE]: " + e.ToString());
                 }
@@ -292,6 +289,7 @@ namespace OpenSim.Region.Environment.Modules
                 AssetRequests.RemoveAt(0);
             }
         }
+
         /// <summary>
         /// Calculate the number of packets required to send the asset to the client.
         /// </summary>
@@ -335,4 +333,4 @@ namespace OpenSim.Region.Environment.Modules
             }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1