aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2011-01-18 01:28:50 +0000
committerMelanie2011-01-18 01:28:50 +0000
commit6306578fcf812bfdb27cb00b6c3fc2886e247b87 (patch)
tree19f379c3507a1714af5d7bb223dda1f6b0a8dddb /OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-6306578fcf812bfdb27cb00b6c3fc2886e247b87.zip
opensim-SC-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.gz
opensim-SC-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.bz2
opensim-SC-6306578fcf812bfdb27cb00b6c3fc2886e247b87.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index daf94fe..feea196 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
58 MethodBase.GetCurrentMethod().DeclaringType); 58 MethodBase.GetCurrentMethod().DeclaringType);
59 59
60 private string m_ServerURI = String.Empty; 60 private string m_ServerURI = String.Empty;
61 private bool m_Enabled = false; 61// private bool m_Enabled = false;
62 62
63 public SimianGridServiceConnector() { } 63 public SimianGridServiceConnector() { }
64 public SimianGridServiceConnector(string serverURI) 64 public SimianGridServiceConnector(string serverURI)
@@ -95,7 +95,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
95 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) 95 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
96 serviceUrl = serviceUrl + '/'; 96 serviceUrl = serviceUrl + '/';
97 m_ServerURI = serviceUrl; 97 m_ServerURI = serviceUrl;
98 m_Enabled = true; 98// m_Enabled = true;
99 } 99 }
100 100
101 #region IGridService 101 #region IGridService
@@ -186,7 +186,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
186 } 186 }
187 } 187 }
188 188
189 m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); 189// m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID);
190 return regions; 190 return regions;
191 } 191 }
192 192