diff options
Diffstat (limited to '')
4 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index b62459e..918544f 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
56 | MethodBase.GetCurrentMethod().DeclaringType); | 56 | MethodBase.GetCurrentMethod().DeclaringType); |
57 | 57 | ||
58 | private string m_ServerURI = String.Empty; | 58 | private string m_ServerURI = String.Empty; |
59 | private bool m_Enabled = false; | 59 | // private bool m_Enabled = false; |
60 | 60 | ||
61 | public SimianGridServiceConnector() { } | 61 | public SimianGridServiceConnector() { } |
62 | public SimianGridServiceConnector(string serverURI) | 62 | public SimianGridServiceConnector(string serverURI) |
@@ -93,7 +93,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
93 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) | 93 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) |
94 | serviceUrl = serviceUrl + '/'; | 94 | serviceUrl = serviceUrl + '/'; |
95 | m_ServerURI = serviceUrl; | 95 | m_ServerURI = serviceUrl; |
96 | m_Enabled = true; | 96 | // m_Enabled = true; |
97 | } | 97 | } |
98 | 98 | ||
99 | #region IGridService | 99 | #region IGridService |
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 | |||
43 | { | 43 | { |
44 | public class EstateDataService : ServiceBase, IEstateDataService | 44 | public class EstateDataService : ServiceBase, IEstateDataService |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | // private static readonly ILog m_log = |
47 | LogManager.GetLogger( | 47 | // LogManager.GetLogger( |
48 | MethodBase.GetCurrentMethod().DeclaringType); | 48 | // MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | protected IEstateDataStore m_database; | 50 | protected IEstateDataStore m_database; |
51 | 51 | ||
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 | |||
43 | { | 43 | { |
44 | public class SimulationDataService : ServiceBase, ISimulationDataService | 44 | public class SimulationDataService : ServiceBase, ISimulationDataService |
45 | { | 45 | { |
46 | private static readonly ILog m_log = | 46 | // private static readonly ILog m_log = |
47 | LogManager.GetLogger( | 47 | // LogManager.GetLogger( |
48 | MethodBase.GetCurrentMethod().DeclaringType); | 48 | // MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | protected ISimulationDataStore m_database; | 50 | protected ISimulationDataStore m_database; |
51 | 51 | ||
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index f34c2bd..143c296 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -237,7 +237,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
237 | 237 | ||
238 | try | 238 | try |
239 | { | 239 | { |
240 | OSDMap result = WebUtil.ServiceOSDRequest(uri,null,"DELETE",10000); | 240 | WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000); |
241 | } | 241 | } |
242 | catch (Exception e) | 242 | catch (Exception e) |
243 | { | 243 | { |
@@ -257,7 +257,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
257 | 257 | ||
258 | try | 258 | try |
259 | { | 259 | { |
260 | OSDMap result = WebUtil.ServiceOSDRequest(uri,null,"DELETE",10000); | 260 | WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000); |
261 | } | 261 | } |
262 | catch (Exception e) | 262 | catch (Exception e) |
263 | { | 263 | { |
@@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
303 | args["destination_name"] = OSD.FromString(destination.RegionName); | 303 | args["destination_name"] = OSD.FromString(destination.RegionName); |
304 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 304 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
305 | 305 | ||
306 | OSDMap result = WebUtil.PostToService(uri,args); | 306 | WebUtil.PostToService(uri, args); |
307 | } | 307 | } |
308 | catch (Exception e) | 308 | catch (Exception e) |
309 | { | 309 | { |