aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-24 20:36:32 +0000
committerJustin Clarke Casey2009-03-24 20:36:32 +0000
commit22a4d6acc2e0cc42d922a0d45e75f446a459a006 (patch)
treeb21136822ec75299669363188ce497e0dd48aec3
parent* Fix edit scale command - was looking for one too few arguments (diff)
downloadopensim-SC_OLD-22a4d6acc2e0cc42d922a0d45e75f446a459a006.zip
opensim-SC_OLD-22a4d6acc2e0cc42d922a0d45e75f446a459a006.tar.gz
opensim-SC_OLD-22a4d6acc2e0cc42d922a0d45e75f446a459a006.tar.bz2
opensim-SC_OLD-22a4d6acc2e0cc42d922a0d45e75f446a459a006.tar.xz
* minor: remove mono compiler warnings
-rw-r--r--OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs11
-rw-r--r--OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs8
2 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
index ff506bf..848d05c 100644
--- a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services
93 93
94 public class AssetService 94 public class AssetService
95 { 95 {
96 private IUserService m_userService; 96// private IUserService m_userService;
97 private bool m_doLookup = false; 97 private bool m_doLookup = false;
98 98
99 public bool DoLookup 99 public bool DoLookup
@@ -101,13 +101,13 @@ namespace OpenSim.Region.CoreModules.Framework.Services
101 get { return m_doLookup; } 101 get { return m_doLookup; }
102 set { m_doLookup = value; } 102 set { m_doLookup = value; }
103 } 103 }
104 private static readonly ILog m_log 104// private static readonly ILog m_log
105 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 105// = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
106 106
107 public AssetService(Scene m_scene) 107 public AssetService(Scene m_scene)
108 { 108 {
109 AddHttpHandlers(m_scene); 109 AddHttpHandlers(m_scene);
110 m_userService = m_scene.CommsManager.UserService; 110// m_userService = m_scene.CommsManager.UserService;
111 } 111 }
112 112
113 protected void AddHttpHandlers(Scene m_scene) 113 protected void AddHttpHandlers(Scene m_scene)
@@ -117,8 +117,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services
117 117
118 IHttpServer httpServer = m_scene.CommsManager.HttpServer; 118 IHttpServer httpServer = m_scene.CommsManager.HttpServer;
119 httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider)); 119 httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider));
120 httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider)); 120 httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider));
121
122 } 121 }
123 } 122 }
124} 123}
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
index 8189b72..e706c55 100644
--- a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services
100 100
101 public class GridService 101 public class GridService
102 { 102 {
103 private IUserService m_userService; 103// private IUserService m_userService;
104 private IGridServices m_gridService; 104 private IGridServices m_gridService;
105 private bool m_doLookup = false; 105 private bool m_doLookup = false;
106 106
@@ -115,14 +115,14 @@ namespace OpenSim.Region.CoreModules.Framework.Services
115 public GridService(Scene m_scene) 115 public GridService(Scene m_scene)
116 { 116 {
117 AddHandlers(m_scene); 117 AddHandlers(m_scene);
118 m_userService = m_scene.CommsManager.UserService; 118// m_userService = m_scene.CommsManager.UserService;
119 m_gridService = m_scene.CommsManager.GridService; 119 m_gridService = m_scene.CommsManager.GridService;
120 } 120 }
121 121
122 protected void AddHandlers(Scene m_scene) 122 protected void AddHandlers(Scene m_scene)
123 { 123 {
124 IAssetDataPlugin m_assetProvider 124// IAssetDataPlugin m_assetProvider
125 = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin; 125// = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin;
126 126
127 IHttpServer httpServer = m_scene.CommsManager.HttpServer; 127 IHttpServer httpServer = m_scene.CommsManager.HttpServer;
128 httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod); 128 httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod);