Fix Simian regression

OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs

@@ -81,7 +81,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianAssetServiceConnector(IConfigSource source)
         {
-            Initialise(source);
+            CommonInit(source);
         }
 
         public void Initialise(IConfigSource source)
@@ -91,6 +91,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("AssetServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["AssetService"];
             if (gridConfig != null)
@@ -109,8 +114,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             else
                 m_Enabled = true;
         }
-            }
-        }
 
         #region IAssetService
 

OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs

@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianAuthenticationServiceConnector(IConfigSource source)
         {
-            Initialise(source);
+            CommonInit(source);
         }
 
         public void Initialise(IConfigSource source)
@@ -79,6 +79,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("AuthenticationServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["AuthenticationService"];
             if (gridConfig != null)
@@ -96,8 +101,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (String.IsNullOrEmpty(m_serverUrl))
                 m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
         }
-            }
-        }
 
         public string Authenticate(UUID principalID, string password, int lifetime)
         {

OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs

@@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianAvatarServiceConnector(IConfigSource source)
         {
-            Initialise(source);
+            CommonInit(source);
         }
 
         public void Initialise(IConfigSource source)
@@ -84,6 +84,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("AvatarServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["AvatarService"];
             if (gridConfig != null)
@@ -101,8 +106,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (String.IsNullOrEmpty(m_serverUrl))
                 m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
         }
-            }
-        }
 
         #region IAvatarService
 

OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs

@@ -98,7 +98,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianGridServiceConnector(IConfigSource source)
         {
-            Initialise(source);
+            CommonInit(source);
         }
 
         public void Initialise(IConfigSource source)
@@ -108,6 +108,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("GridServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["GridService"];
             if (gridConfig != null)
@@ -125,8 +130,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (String.IsNullOrEmpty(m_serverUrl))
                 m_log.Info("[SIMIAN GRID CONNECTOR]: No GridServerURI specified, disabling connector");
         }
-            }
-        }
 
         #region IGridService
 

OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs

@@ -88,7 +88,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianInventoryServiceConnector(IConfigSource source)
         {
-            Initialise(source);
+            CommonInit(source);
         }
 
         public void Initialise(IConfigSource source)
@@ -98,6 +98,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("InventoryServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["InventoryService"];
             if (gridConfig != null)
@@ -127,8 +132,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             else if (String.IsNullOrEmpty(m_userServerUrl))
                 m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No UserAccountServerURI specified, disabling connector");
         }
-            }
-        }
 
         /// <summary>
         /// Create the entire inventory for a given user

OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs

@@ -99,7 +99,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianPresenceServiceConnector(IConfigSource source)
         {
-            Initialise(source);
+            CommonInit(source);
         }
 
         public void Initialise(IConfigSource source)
@@ -109,6 +109,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("PresenceServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["PresenceService"];
             if (gridConfig != null)
@@ -126,8 +131,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (String.IsNullOrEmpty(m_serverUrl))
                 m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector");
         }
-            }
-        }
 
         #region IPresenceService
 

OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs

@@ -73,7 +73,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianUserAccountServiceConnector(IConfigSource source)
         {
-            Initialise(source);
+            CommonInit(source);
         }
 
         public void Initialise(IConfigSource source)
@@ -83,6 +83,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             {
                 string name = moduleConfig.GetString("UserAccountServices", "");
                 if (name == Name)
+                    CommonInit(source);
+            }
+        }
+
+        private void CommonInit(IConfigSource source)
         {
             IConfig gridConfig = source.Configs["UserAccountService"];
             if (gridConfig != null)
@@ -100,8 +105,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (String.IsNullOrEmpty(m_serverUrl))
                 m_log.Info("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI specified, disabling connector");
         }
-            }
-        }
 
         public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
         {