aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2016-11-21 01:47:09 +0000
committerUbitUmarov2016-11-21 01:47:09 +0000
commitbced98d6e9b5fe08fd50a1be88c10a83063c309e (patch)
tree841a549a3433053efa8f09b3b3ab2cdc4ca9030a /OpenSim
parentremove something VS decided to add (diff)
downloadopensim-SC_OLD-bced98d6e9b5fe08fd50a1be88c10a83063c309e.zip
opensim-SC_OLD-bced98d6e9b5fe08fd50a1be88c10a83063c309e.tar.gz
opensim-SC_OLD-bced98d6e9b5fe08fd50a1be88c10a83063c309e.tar.bz2
opensim-SC_OLD-bced98d6e9b5fe08fd50a1be88c10a83063c309e.tar.xz
work around some more warnings
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/AgentPreferences/AgentPreferencesConnector.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
index ad9544a..a827c4c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences
61 get { return "RemoteAgentPreferencesServicesConnector"; } 61 get { return "RemoteAgentPreferencesServicesConnector"; }
62 } 62 }
63 63
64 public override void Initialise(IConfigSource source) 64 public new void Initialise(IConfigSource source)
65 { 65 {
66 IConfig moduleConfig = source.Configs["Modules"]; 66 IConfig moduleConfig = source.Configs["Modules"];
67 if (moduleConfig != null) 67 if (moduleConfig != null)
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)