aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-08-02 17:38:08 -0700
committerDiva Canto2013-08-02 17:38:08 -0700
commit847c01f406359289097a6ad8d681002a4beff086 (patch)
treea7d13bf67b6860dd93ade1bb10fc1843e799fd4f
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-847c01f406359289097a6ad8d681002a4beff086.zip
opensim-SC_OLD-847c01f406359289097a6ad8d681002a4beff086.tar.gz
opensim-SC_OLD-847c01f406359289097a6ad8d681002a4beff086.tar.bz2
opensim-SC_OLD-847c01f406359289097a6ad8d681002a4beff086.tar.xz
Amend Justin's last commit regarding the new config var ServiceVersion. The section may not exist at all.
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 7aadb87..e86d186 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -84,10 +84,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
84 84
85 public void InitialiseService(IConfigSource configSource) 85 public void InitialiseService(IConfigSource configSource)
86 { 86 {
87 ServiceVersion = "SIMULATION/0.2";
87 IConfig config = configSource.Configs["SimulationService"]; 88 IConfig config = configSource.Configs["SimulationService"];
88 if (config != null) 89 if (config != null)
89 { 90 {
90 ServiceVersion = config.GetString("ConnectorProtocolVersion", "SIMULATION/0.2"); 91 ServiceVersion = config.GetString("ConnectorProtocolVersion", ServiceVersion);
91 92
92 if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2") 93 if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2")
93 throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion)); 94 throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion));