aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2010-09-07 20:19:52 +0100
committerMelanie2010-09-07 20:21:05 +0100
commitb28d1b6ccd3e8728e429528ea87714680e6ac643 (patch)
tree58276a6de9de7590788bca9e6904bee45132227c /OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
parentSimianUserAccountServiceConnector was not initializing the user cache (diff)
downloadopensim-SC-b28d1b6ccd3e8728e429528ea87714680e6ac643.zip
opensim-SC-b28d1b6ccd3e8728e429528ea87714680e6ac643.tar.gz
opensim-SC-b28d1b6ccd3e8728e429528ea87714680e6ac643.tar.bz2
opensim-SC-b28d1b6ccd3e8728e429528ea87714680e6ac643.tar.xz
Fix Simian regression
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs35
1 files changed, 19 insertions, 16 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 7e56bd1..3505c64 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
74 74
75 public SimianAvatarServiceConnector(IConfigSource source) 75 public SimianAvatarServiceConnector(IConfigSource source)
76 { 76 {
77 Initialise(source); 77 CommonInit(source);
78 } 78 }
79 79
80 public void Initialise(IConfigSource source) 80 public void Initialise(IConfigSource source)
@@ -84,24 +84,27 @@ namespace OpenSim.Services.Connectors.SimianGrid
84 { 84 {
85 string name = moduleConfig.GetString("AvatarServices", ""); 85 string name = moduleConfig.GetString("AvatarServices", "");
86 if (name == Name) 86 if (name == Name)
87 { 87 CommonInit(source);
88 IConfig gridConfig = source.Configs["AvatarService"]; 88 }
89 if (gridConfig != null) 89 }
90 {
91 string serviceUrl = gridConfig.GetString("AvatarServerURI");
92 if (!String.IsNullOrEmpty(serviceUrl))
93 {
94 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
95 serviceUrl = serviceUrl + '/';
96 m_serverUrl = serviceUrl;
97 m_Enabled = true;
98 }
99 }
100 90
101 if (String.IsNullOrEmpty(m_serverUrl)) 91 private void CommonInit(IConfigSource source)
102 m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector"); 92 {
93 IConfig gridConfig = source.Configs["AvatarService"];
94 if (gridConfig != null)
95 {
96 string serviceUrl = gridConfig.GetString("AvatarServerURI");
97 if (!String.IsNullOrEmpty(serviceUrl))
98 {
99 if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
100 serviceUrl = serviceUrl + '/';
101 m_serverUrl = serviceUrl;
102 m_Enabled = true;
103 } 103 }
104 } 104 }
105
106 if (String.IsNullOrEmpty(m_serverUrl))
107 m_log.Info("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI specified, disabling connector");
105 } 108 }
106 109
107 #region IAvatarService 110 #region IAvatarService