From 847c01f406359289097a6ad8d681002a4beff086 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 2 Aug 2013 17:38:08 -0700
Subject: Amend Justin's last commit regarding the new config var
 ServiceVersion. The section may not exist at all.

---
 .../ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

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
 
         public void InitialiseService(IConfigSource configSource)
         {
+            ServiceVersion = "SIMULATION/0.2";
             IConfig config = configSource.Configs["SimulationService"];
             if (config != null)
             {
-                ServiceVersion = config.GetString("ConnectorProtocolVersion", "SIMULATION/0.2");
+                ServiceVersion = config.GetString("ConnectorProtocolVersion", ServiceVersion);
 
                 if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2")
                     throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion));
-- 
cgit v1.1