aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-26 15:13:55 -0700
committerJohn Hurliman2010-03-26 15:13:55 -0700
commit1430441cf32c659502c6ed1bd7fd54e55a107c05 (patch)
tree23e3e318fc2b043e1f5ec9c8dc3dee436b8fbfa1 /OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.zip
opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.gz
opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.bz2
opensim-SC_OLD-1430441cf32c659502c6ed1bd7fd54e55a107c05.tar.xz
Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 00f9f36..a47f32c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -83,14 +83,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
83 IConfig gridConfig = source.Configs["AvatarService"]; 83 IConfig gridConfig = source.Configs["AvatarService"];
84 if (gridConfig == null) 84 if (gridConfig == null)
85 { 85 {
86 m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini"); 86 m_log.Error("[SIMIAN AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
87 throw new Exception("Avatar connector init error"); 87 throw new Exception("Avatar connector init error");
88 } 88 }
89 89
90 string serviceUrl = gridConfig.GetString("AvatarServerURI"); 90 string serviceUrl = gridConfig.GetString("AvatarServerURI");
91 if (String.IsNullOrEmpty(serviceUrl)) 91 if (String.IsNullOrEmpty(serviceUrl))
92 { 92 {
93 m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService"); 93 m_log.Error("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService");
94 throw new Exception("Avatar connector init error"); 94 throw new Exception("Avatar connector init error");
95 } 95 }
96 96
@@ -156,14 +156,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
156 } 156 }
157 else 157 else
158 { 158 {
159 m_log.Warn("[AVATAR CONNECTOR]: Failed to get user appearance for " + userID + 159 m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed to get user appearance for " + userID +
160 ", LLAppearance is missing or invalid"); 160 ", LLAppearance is missing or invalid");
161 return null; 161 return null;
162 } 162 }
163 } 163 }
164 else 164 else
165 { 165 {
166 m_log.Warn("[AVATAR CONNECTOR]: Failed to get user appearance for " + userID + ": " + 166 m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed to get user appearance for " + userID + ": " +
167 response["Message"].AsString()); 167 response["Message"].AsString());
168 } 168 }
169 169
@@ -172,7 +172,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
172 172
173 public bool SetAvatar(UUID userID, AvatarData avatar) 173 public bool SetAvatar(UUID userID, AvatarData avatar)
174 { 174 {
175 m_log.Debug("[AVATAR CONNECTOR]: SetAvatar called for " + userID); 175 m_log.Debug("[SIMIAN AVATAR CONNECTOR]: SetAvatar called for " + userID);
176 176
177 if (avatar.AvatarType == 1) // LLAvatar 177 if (avatar.AvatarType == 1) // LLAvatar
178 { 178 {
@@ -228,32 +228,32 @@ namespace OpenSim.Services.Connectors.SimianGrid
228 bool success = response["Success"].AsBoolean(); 228 bool success = response["Success"].AsBoolean();
229 229
230 if (!success) 230 if (!success)
231 m_log.Warn("[AVATAR CONNECTOR]: Failed saving appearance for " + userID + ": " + response["Message"].AsString()); 231 m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed saving appearance for " + userID + ": " + response["Message"].AsString());
232 232
233 return success; 233 return success;
234 } 234 }
235 else 235 else
236 { 236 {
237 m_log.Error("[AVATAR CONNECTOR]: Can't save appearance for " + userID + ". Unhandled avatar type " + avatar.AvatarType); 237 m_log.Error("[SIMIAN AVATAR CONNECTOR]: Can't save appearance for " + userID + ". Unhandled avatar type " + avatar.AvatarType);
238 return false; 238 return false;
239 } 239 }
240 } 240 }
241 241
242 public bool ResetAvatar(UUID userID) 242 public bool ResetAvatar(UUID userID)
243 { 243 {
244 m_log.Error("[AVATAR CONNECTOR]: ResetAvatar called for " + userID + ", implement this"); 244 m_log.Error("[SIMIAN AVATAR CONNECTOR]: ResetAvatar called for " + userID + ", implement this");
245 return false; 245 return false;
246 } 246 }
247 247
248 public bool SetItems(UUID userID, string[] names, string[] values) 248 public bool SetItems(UUID userID, string[] names, string[] values)
249 { 249 {
250 m_log.Error("[AVATAR CONNECTOR]: SetItems called for " + userID + " with " + names.Length + " names and " + values.Length + " values, implement this"); 250 m_log.Error("[SIMIAN AVATAR CONNECTOR]: SetItems called for " + userID + " with " + names.Length + " names and " + values.Length + " values, implement this");
251 return false; 251 return false;
252 } 252 }
253 253
254 public bool RemoveItems(UUID userID, string[] names) 254 public bool RemoveItems(UUID userID, string[] names)
255 { 255 {
256 m_log.Error("[AVATAR CONNECTOR]: RemoveItems called for " + userID + " with " + names.Length + " names, implement this"); 256 m_log.Error("[SIMIAN AVATAR CONNECTOR]: RemoveItems called for " + userID + " with " + names.Length + " names, implement this");
257 return false; 257 return false;
258 } 258 }
259 259