aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs31
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
78 78
79 public void Initialise(IConfigSource source) 79 public void Initialise(IConfigSource source)
80 { 80 {
81 IConfig gridConfig = source.Configs["AvatarService"]; 81 if (Simian.IsSimianEnabled(source, "AvatarServices"))
82 if (gridConfig == null)
83 { 82 {
84 m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini"); 83 IConfig gridConfig = source.Configs["AvatarService"];
85 throw new Exception("Avatar connector init error"); 84 if (gridConfig == null)
86 } 85 {
86 m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
87 throw new Exception("Avatar connector init error");
88 }
87 89
88 string serviceUrl = gridConfig.GetString("AvatarServerURI"); 90 string serviceUrl = gridConfig.GetString("AvatarServerURI");
89 if (String.IsNullOrEmpty(serviceUrl)) 91 if (String.IsNullOrEmpty(serviceUrl))
90 { 92 {
91 m_log.Info("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService, skipping SimianAvatarServiceConnector"); 93 m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService");
92 return; 94 throw new Exception("Avatar connector init error");
93 } 95 }
94 96
95 if (!serviceUrl.EndsWith("/")) 97 if (!serviceUrl.EndsWith("/"))
96 serviceUrl = serviceUrl + '/'; 98 serviceUrl = serviceUrl + '/';
97 99
98 m_serverUrl = serviceUrl; 100 m_serverUrl = serviceUrl;
101 }
99 } 102 }
100 103
101 #region IAvatarService 104 #region IAvatarService