diff options
author | Diva Canto | 2013-07-06 15:17:55 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-06 15:17:55 -0700 |
commit | b29a09ab8e4040cc09f8021f638d7604f2372bad (patch) | |
tree | 2a38628fa7fec735c85f33105152d4af680468af /OpenSim | |
parent | Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to be... (diff) | |
download | opensim-SC-b29a09ab8e4040cc09f8021f638d7604f2372bad.zip opensim-SC-b29a09ab8e4040cc09f8021f638d7604f2372bad.tar.gz opensim-SC-b29a09ab8e4040cc09f8021f638d7604f2372bad.tar.bz2 opensim-SC-b29a09ab8e4040cc09f8021f638d7604f2372bad.tar.xz |
Simina activity detector was too eager. Disabled it in case simian is not being used.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | 3 |
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 | } |