diff options
author | Justin Clark-Casey (justincc) | 2011-01-28 21:51:25 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-01-28 21:51:25 +0000 |
commit | ab1ec3c3cccf30ab61379b700129ca3284578274 (patch) | |
tree | f422f3c4ce7bc7588ff97bf3315d31384d1aae68 | |
parent | Display supported file extensions/formats in "terrain load help" (Mantis #5349) (diff) | |
download | opensim-SC_OLD-ab1ec3c3cccf30ab61379b700129ca3284578274.zip opensim-SC_OLD-ab1ec3c3cccf30ab61379b700129ca3284578274.tar.gz opensim-SC_OLD-ab1ec3c3cccf30ab61379b700129ca3284578274.tar.bz2 opensim-SC_OLD-ab1ec3c3cccf30ab61379b700129ca3284578274.tar.xz |
minor: remove a few mono compiler warnings
3 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs index 542af25..4a42c93 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
54 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private Scene m_scene; | 56 | private Scene m_scene; |
57 | private IAssetService m_assetService; | 57 | // private IAssetService m_assetService; |
58 | private bool m_dumpAssetsToFile = false; | 58 | private bool m_dumpAssetsToFile = false; |
59 | 59 | ||
60 | #region IRegionModuleBase Members | 60 | #region IRegionModuleBase Members |
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
85 | public void RegionLoaded(Scene scene) | 85 | public void RegionLoaded(Scene scene) |
86 | { | 86 | { |
87 | 87 | ||
88 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | 88 | // m_assetService = m_scene.RequestModuleInterface<IAssetService>(); |
89 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 89 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
90 | } | 90 | } |
91 | 91 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs index 155335b..ddef75f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | |||
@@ -38,9 +38,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
38 | { | 38 | { |
39 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! | 39 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! |
40 | 40 | ||
41 | private static readonly ILog m_log = | 41 | // private static readonly ILog m_log = |
42 | LogManager.GetLogger( | 42 | // LogManager.GetLogger( |
43 | MethodBase.GetCurrentMethod().DeclaringType); | 43 | // MethodBase.GetCurrentMethod().DeclaringType); |
44 | |||
44 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; | 45 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; |
45 | private ExpiringCache<string, UUID> m_NameCache; | 46 | private ExpiringCache<string, UUID> m_NameCache; |
46 | 47 | ||
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs index c65aa6a..ab6a598 100644 --- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs +++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs | |||
@@ -45,8 +45,8 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RestartModule")] | 45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RestartModule")] |
46 | public class RestartModule : INonSharedRegionModule, IRestartModule | 46 | public class RestartModule : INonSharedRegionModule, IRestartModule |
47 | { | 47 | { |
48 | private static readonly ILog m_log = | 48 | // private static readonly ILog m_log = |
49 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | protected Scene m_Scene; | 51 | protected Scene m_Scene; |
52 | protected Timer m_CountdownTimer = null; | 52 | protected Timer m_CountdownTimer = null; |