1 files changed, 17 insertions, 14 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 697bb43..a18cb22 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -78,24 +78,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public void Initialise(IConfigSource source)
         {
-            IConfig gridConfig = source.Configs["AvatarService"];
-            if (gridConfig == null)
+            if (Simian.IsSimianEnabled(source, "AvatarServices"))
             {
-                m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
-                throw new Exception("Avatar connector init error");
-            }
+                IConfig gridConfig = source.Configs["AvatarService"];
+                if (gridConfig == null)
+                {
+                    m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
+                    throw new Exception("Avatar connector init error");
+                }
 
-            string serviceUrl = gridConfig.GetString("AvatarServerURI");
-            if (String.IsNullOrEmpty(serviceUrl))
-            {
-                m_log.Info("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService, skipping SimianAvatarServiceConnector");
-                return;
-            }
+                string serviceUrl = gridConfig.GetString("AvatarServerURI");
+                if (String.IsNullOrEmpty(serviceUrl))
+                {
+                    m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService");
+                    throw new Exception("Avatar connector init error");
+                }
 
-            if (!serviceUrl.EndsWith("/"))
-                serviceUrl = serviceUrl + '/';
+                if (!serviceUrl.EndsWith("/"))
+                    serviceUrl = serviceUrl + '/';
 
-            m_serverUrl = serviceUrl;
+                m_serverUrl = serviceUrl;
+            }
         }
 
         #region IAvatarService