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.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 08403b9..b5cef0c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
48 /// Connects avatar appearance data to the SimianGrid backend 48 /// Connects avatar appearance data to the SimianGrid backend
49 /// </summary> 49 /// </summary>
50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] 50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
51 public class SimianAvatarServiceConnector : IAvatarService 51 public class SimianAvatarServiceConnector : IAvatarService, ISharedRegionModule
52 { 52 {
53 private static readonly ILog m_log = 53 private static readonly ILog m_log =
54 LogManager.GetLogger( 54 LogManager.GetLogger(
@@ -66,8 +66,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
66 66
67 public SimianAvatarServiceConnector() { } 67 public SimianAvatarServiceConnector() { }
68 public string Name { get { return "SimianAvatarServiceConnector"; } } 68 public string Name { get { return "SimianAvatarServiceConnector"; } }
69 public void AddRegion(Scene scene) { scene.RegisterModuleInterface<IAvatarService>(this); } 69 public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IAvatarService>(this); } }
70 public void RemoveRegion(Scene scene) { scene.UnregisterModuleInterface<IAvatarService>(this); } 70 public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IAvatarService>(this); } }
71 71
72 #endregion ISharedRegionModule 72 #endregion ISharedRegionModule
73 73
@@ -81,8 +81,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
81 IConfig gridConfig = source.Configs["AvatarService"]; 81 IConfig gridConfig = source.Configs["AvatarService"];
82 if (gridConfig == null) 82 if (gridConfig == null)
83 { 83 {
84 m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini"); 84 m_log.Info("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini, skipping SimianAvatarServiceConnector");
85 throw new Exception("Avatar connector init error"); 85 return;
86 } 86 }
87 87
88 string serviceUrl = gridConfig.GetString("AvatarServerURI"); 88 string serviceUrl = gridConfig.GetString("AvatarServerURI");