aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-08 22:07:27 +0100
committerJustin Clark-Casey (justincc)2013-07-08 22:07:27 +0100
commitc3db5959441dbd1e04cdd32e92bda9eb5bf2853b (patch)
treea7b262be4f9f0dc0c7c5464ce5d657351c53a63e /OpenSim/Services/Connectors
parentAdd "show caps stats by user" and "show caps stats by cap" console commands t... (diff)
parentPlaced a throttle on UserManagementModule for name lookups. Singularity appar... (diff)
downloadopensim-SC_OLD-c3db5959441dbd1e04cdd32e92bda9eb5bf2853b.zip
opensim-SC_OLD-c3db5959441dbd1e04cdd32e92bda9eb5bf2853b.tar.gz
opensim-SC_OLD-c3db5959441dbd1e04cdd32e92bda9eb5bf2853b.tar.bz2
opensim-SC_OLD-c3db5959441dbd1e04cdd32e92bda9eb5bf2853b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 7bb06fb..0a39088 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
65 public void PostInitialise() { } 65 public void PostInitialise() { }
66 public void Close() { } 66 public void Close() { }
67 67
68 public SimianPresenceServiceConnector() { m_activityDetector = new SimianActivityDetector(this); } 68 public SimianPresenceServiceConnector() { }
69 public string Name { get { return "SimianPresenceServiceConnector"; } } 69 public string Name { get { return "SimianPresenceServiceConnector"; } }
70 public void AddRegion(Scene scene) 70 public void AddRegion(Scene scene)
71 { 71 {
@@ -121,6 +121,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
121 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) 121 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
122 serviceUrl = serviceUrl + '/'; 122 serviceUrl = serviceUrl + '/';
123 m_serverUrl = serviceUrl; 123 m_serverUrl = serviceUrl;
124 m_activityDetector = new SimianActivityDetector(this);
124 m_Enabled = true; 125 m_Enabled = true;
125 } 126 }
126 } 127 }