diff options
author | Justin Clarke Casey | 2009-02-25 20:53:02 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-25 20:53:02 +0000 |
commit | 36e648a37aac3d169dbf28ce14c75f488da8a11e (patch) | |
tree | 89299f4b5d6fab106db7865b76dca34573cf1f34 /OpenSim/Grid | |
parent | * Properly load items into correct folders when an iar is loaded (diff) | |
download | opensim-SC-36e648a37aac3d169dbf28ce14c75f488da8a11e.zip opensim-SC-36e648a37aac3d169dbf28ce14c75f488da8a11e.tar.gz opensim-SC-36e648a37aac3d169dbf28ce14c75f488da8a11e.tar.bz2 opensim-SC-36e648a37aac3d169dbf28ce14c75f488da8a11e.tar.xz |
* minor: Remove most mono compiler warnings
Diffstat (limited to 'OpenSim/Grid')
6 files changed, 11 insertions, 9 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs index 6430e2a..6e7519d 100644 --- a/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs +++ b/OpenSim/Grid/AssetInventoryServer/Plugins/BrowseFrontendPlugin.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
42 | public class BrowseFrontendPlugin : IAssetInventoryServerPlugin | 42 | public class BrowseFrontendPlugin : IAssetInventoryServerPlugin |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | private AssetInventoryServer m_server; | 45 | //private AssetInventoryServer m_server; |
46 | 46 | ||
47 | public BrowseFrontendPlugin() | 47 | public BrowseFrontendPlugin() |
48 | { | 48 | { |
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.AssetInventoryServer.Plugins | |||
52 | 52 | ||
53 | public void Initialise(AssetInventoryServer server) | 53 | public void Initialise(AssetInventoryServer server) |
54 | { | 54 | { |
55 | m_server = server; | 55 | //m_server = server; |
56 | 56 | ||
57 | // Request for / or /?... | 57 | // Request for / or /?... |
58 | //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server)); | 58 | //m_server.HttpServer.AddStreamHandler(new BrowseRequestHandler(server)); |
diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs index c3b722c..8ae19a9 100644 --- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
40 | { | 40 | { |
41 | public class GridMessagingModule : IMessagingServerDiscovery | 41 | public class GridMessagingModule : IMessagingServerDiscovery |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | protected GridDBService m_gridDBService; | 45 | protected GridDBService m_gridDBService; |
46 | protected IGridServiceCore m_gridCore; | 46 | protected IGridServiceCore m_gridCore; |
@@ -50,7 +50,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
50 | /// <value> | 50 | /// <value> |
51 | /// Used to notify old regions as to which OpenSim version to upgrade to | 51 | /// Used to notify old regions as to which OpenSim version to upgrade to |
52 | /// </value> | 52 | /// </value> |
53 | private string m_opensimVersion; | 53 | //private string m_opensimVersion; |
54 | 54 | ||
55 | protected BaseHttpServer m_httpServer; | 55 | protected BaseHttpServer m_httpServer; |
56 | 56 | ||
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
63 | 63 | ||
64 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) | 64 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) |
65 | { | 65 | { |
66 | m_opensimVersion = opensimVersion; | 66 | //m_opensimVersion = opensimVersion; |
67 | m_gridDBService = gridDBService; | 67 | m_gridDBService = gridDBService; |
68 | m_gridCore = gridCore; | 68 | m_gridCore = gridCore; |
69 | m_config = config; | 69 | m_config = config; |
diff --git a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs index 95fa706..7df6514 100644 --- a/OpenSim/Grid/GridServer.Modules/GridRestModule.cs +++ b/OpenSim/Grid/GridServer.Modules/GridRestModule.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
53 | /// <value> | 53 | /// <value> |
54 | /// Used to notify old regions as to which OpenSim version to upgrade to | 54 | /// Used to notify old regions as to which OpenSim version to upgrade to |
55 | /// </value> | 55 | /// </value> |
56 | private string m_opensimVersion; | 56 | //private string m_opensimVersion; |
57 | 57 | ||
58 | protected BaseHttpServer m_httpServer; | 58 | protected BaseHttpServer m_httpServer; |
59 | 59 | ||
@@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer.Modules | |||
69 | 69 | ||
70 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) | 70 | public void Initialise(string opensimVersion, GridDBService gridDBService, IGridServiceCore gridCore, GridConfig config) |
71 | { | 71 | { |
72 | m_opensimVersion = opensimVersion; | 72 | //m_opensimVersion = opensimVersion; |
73 | m_gridDBService = gridDBService; | 73 | m_gridDBService = gridDBService; |
74 | m_gridCore = gridCore; | 74 | m_gridCore = gridCore; |
75 | m_config = config; | 75 | m_config = config; |
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs index a5a630e..a53dee7 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerAvatarAppearanceModule.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
41 | { | 41 | { |
42 | public class UserServerAvatarAppearanceModule | 42 | public class UserServerAvatarAppearanceModule |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private UserDataBaseService m_userDataBaseService; | 46 | private UserDataBaseService m_userDataBaseService; |
47 | private BaseHttpServer m_httpServer; | 47 | private BaseHttpServer m_httpServer; |
diff --git a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs index 49e94ee..8fc474f 100644 --- a/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs +++ b/OpenSim/Grid/UserServer.Modules/UserServerFriendsModule.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer.Modules | |||
41 | { | 41 | { |
42 | public class UserServerFriendsModule | 42 | public class UserServerFriendsModule |
43 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private UserDataBaseService m_userDataBaseService; | 46 | private UserDataBaseService m_userDataBaseService; |
47 | 47 | ||
diff --git a/OpenSim/Grid/UserServer/UserServerCommandModule.cs b/OpenSim/Grid/UserServer/UserServerCommandModule.cs index 7f7108c..f73b3de 100644 --- a/OpenSim/Grid/UserServer/UserServerCommandModule.cs +++ b/OpenSim/Grid/UserServer/UserServerCommandModule.cs | |||
@@ -241,10 +241,12 @@ namespace OpenSim.Grid.UserServer | |||
241 | m_userDataBaseService.ResetUserPassword(firstName, lastName, newPassword); | 241 | m_userDataBaseService.ResetUserPassword(firstName, lastName, newPassword); |
242 | } | 242 | } |
243 | 243 | ||
244 | /* | ||
244 | private void HandleTestCommand(string module, string[] cmd) | 245 | private void HandleTestCommand(string module, string[] cmd) |
245 | { | 246 | { |
246 | m_log.Info("test command received"); | 247 | m_log.Info("test command received"); |
247 | } | 248 | } |
249 | */ | ||
248 | 250 | ||
249 | private void HandleLoginCommand(string module, string[] cmd) | 251 | private void HandleLoginCommand(string module, string[] cmd) |
250 | { | 252 | { |