aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs3
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs8
2 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
index e85b0b7..764e71f 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
@@ -56,11 +56,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
56 private Scene m_scene; 56 private Scene m_scene;
57 private String m_simianURL; 57 private String m_simianURL;
58 58
59 private IGridUserService m_GridUserService;
60
61#region IRegionModule Members 59#region IRegionModule Members
62 60
63
64 public string Name 61 public string Name
65 { 62 {
66 get { return this.GetType().Name; } 63 get { return this.GetType().Name; }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index e7d2f86..9898da9 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -29,11 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Collections.Specialized; 30using System.Collections.Specialized;
31using System.Reflection; 31using System.Reflection;
32
33using log4net; 32using log4net;
34using Mono.Addins; 33using Mono.Addins;
35using Nini.Config; 34using Nini.Config;
36
37using OpenSim.Framework; 35using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
@@ -52,7 +50,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53 51
54 private IConfig m_config = null; 52 private IConfig m_config = null;
55 private bool m_enabled = true;
56 53
57 private String m_simianURL; 54 private String m_simianURL;
58 55
@@ -62,7 +59,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
62 { 59 {
63 get { return this.GetType().Name; } 60 get { return this.GetType().Name; }
64 } 61 }
65
66 62
67 public void Initialise(IConfigSource config) 63 public void Initialise(IConfigSource config)
68 { 64 {
@@ -76,7 +72,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
76 if (String.IsNullOrEmpty(m_simianURL)) 72 if (String.IsNullOrEmpty(m_simianURL))
77 { 73 {
78 // m_log.DebugFormat("[SimianGrid] service URL is not defined"); 74 // m_log.DebugFormat("[SimianGrid] service URL is not defined");
79 m_enabled = false;
80 return; 75 return;
81 } 76 }
82 77
@@ -141,6 +136,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
141 } 136 }
142 137
143#endregion 138#endregion
139
144 public static String SimulatorCapability = UUID.Zero.ToString(); 140 public static String SimulatorCapability = UUID.Zero.ToString();
145 public static OSDMap PostToService(string url, NameValueCollection data) 141 public static OSDMap PostToService(string url, NameValueCollection data)
146 { 142 {
@@ -148,4 +144,4 @@ namespace OpenSim.Services.Connectors.SimianGrid
148 return WebUtil.PostToService(url, data); 144 return WebUtil.PostToService(url, data);
149 } 145 }
150 } 146 }
151} 147} \ No newline at end of file