diff options
| author | UbitUmarov | 2016-11-27 15:14:34 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-27 15:14:34 +0000 |
| commit | 877d3092b45723a2fe8b3a5bbc224cd5d5e55e82 (patch) | |
| tree | f11a5b2d85443fefc81e1958c82828a16fc656cc /OpenSim/Services/Connectors/AgentPreferences | |
| parent | fix pool parameters for httptests (diff) | |
| parent | HG on links request build the URI in http format with a / at end, this should... (diff) | |
| download | opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.zip opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.gz opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.bz2 opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Services/Connectors/AgentPreferences')
| -rw-r--r-- | OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs index 1dbc0c8..0e72c8b 100644 --- a/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs +++ b/OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Services.Connectors | |||
| 62 | Initialise(source); | 62 | Initialise(source); |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | public virtual void Initialise(IConfigSource source) | 65 | public void Initialise(IConfigSource source) |
| 66 | { | 66 | { |
| 67 | IConfig gridConfig = source.Configs["AgentPreferencesService"]; | 67 | IConfig gridConfig = source.Configs["AgentPreferencesService"]; |
| 68 | if (gridConfig == null) | 68 | if (gridConfig == null) |