Merge branch 'master' into careminster-presence-refactor

3 files changed, 9 insertions, 9 deletions

diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
index 8a8b46d..b6df5a2 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -43,9 +43,9 @@ namespace OpenSim.Services.Connectors
 {
     public class EstateDataService : ServiceBase, IEstateDataService
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//                LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
 
         protected IEstateDataStore m_database;
 
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index 0df9380..ccef50b 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -43,9 +43,9 @@ namespace OpenSim.Services.Connectors
 {
     public class SimulationDataService : ServiceBase, ISimulationDataService
     {
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log =
+//                LogManager.GetLogger(
+//                MethodBase.GetCurrentMethod().DeclaringType);
 
         protected ISimulationDataStore m_database;
 
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index fbfc2dd..039d9e5 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                OSDMap result = WebUtil.ServiceOSDRequest(uri,null,"DELETE",10000);
+                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000);
             }
             catch (Exception e)
             {
@@ -255,7 +255,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                OSDMap result = WebUtil.ServiceOSDRequest(uri,null,"DELETE",10000);
+                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000);
             }
             catch (Exception e)
             {
@@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.Simulation
                 args["destination_name"] = OSD.FromString(destination.RegionName);
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
 
-                OSDMap result = WebUtil.PostToService(uri,args);
+                WebUtil.PostToService(uri, args);
             }
             catch (Exception e)
             {