diff options
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index 0a36ae5..fbf4648 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
@@ -93,14 +93,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
93 | IConfig gridConfig = source.Configs["UserAccountService"]; | 93 | IConfig gridConfig = source.Configs["UserAccountService"]; |
94 | if (gridConfig == null) | 94 | if (gridConfig == null) |
95 | { | 95 | { |
96 | m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini"); | 96 | m_log.Error("[SIMIAN PROFILES]: UserAccountService missing from OpenSim.ini"); |
97 | throw new Exception("Profiles init error"); | 97 | throw new Exception("Profiles init error"); |
98 | } | 98 | } |
99 | 99 | ||
100 | string serviceUrl = gridConfig.GetString("UserAccountServerURI"); | 100 | string serviceUrl = gridConfig.GetString("UserAccountServerURI"); |
101 | if (String.IsNullOrEmpty(serviceUrl)) | 101 | if (String.IsNullOrEmpty(serviceUrl)) |
102 | { | 102 | { |
103 | m_log.Error("[PROFILES]: No UserAccountServerURI in section UserAccountService"); | 103 | m_log.Error("[SIMIAN PROFILES]: No UserAccountServerURI in section UserAccountService"); |
104 | throw new Exception("Profiles init error"); | 104 | throw new Exception("Profiles init error"); |
105 | } | 105 | } |
106 | 106 | ||
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
153 | UUID targetAvatarID; | 153 | UUID targetAvatarID; |
154 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) | 154 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) |
155 | { | 155 | { |
156 | m_log.Error("[PROFILES]: Unrecognized arguments for " + method); | 156 | m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); |
157 | return; | 157 | return; |
158 | } | 158 | } |
159 | 159 | ||
@@ -193,7 +193,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
193 | UUID targetAvatarID; | 193 | UUID targetAvatarID; |
194 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) | 194 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) |
195 | { | 195 | { |
196 | m_log.Error("[PROFILES]: Unrecognized arguments for " + method); | 196 | m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); |
197 | return; | 197 | return; |
198 | } | 198 | } |
199 | 199 | ||
@@ -211,7 +211,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
211 | UUID pickID; | 211 | UUID pickID; |
212 | if (args.Count < 2 || !UUID.TryParse(args[0], out avatarID) || !UUID.TryParse(args[1], out pickID)) | 212 | if (args.Count < 2 || !UUID.TryParse(args[0], out avatarID) || !UUID.TryParse(args[1], out pickID)) |
213 | { | 213 | { |
214 | m_log.Error("[PROFILES]: Unrecognized arguments for " + method); | 214 | m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); |
215 | return; | 215 | return; |
216 | } | 216 | } |
217 | 217 | ||
@@ -244,7 +244,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
244 | UUID targetAvatarID; | 244 | UUID targetAvatarID; |
245 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) | 245 | if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) |
246 | { | 246 | { |
247 | m_log.Error("[PROFILES]: Unrecognized arguments for " + method); | 247 | m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); |
248 | return; | 248 | return; |
249 | } | 249 | } |
250 | 250 | ||
@@ -305,7 +305,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
305 | } | 305 | } |
306 | else | 306 | else |
307 | { | 307 | { |
308 | m_log.Warn("[PROFILES]: Failed to fetch profile information for " + client.Name + ", returning default values"); | 308 | m_log.Warn("[SIMIAN PROFILES]: Failed to fetch profile information for " + client.Name + ", returning default values"); |
309 | client.SendAvatarProperties(avatarID, String.Empty, "1/1/1970", Utils.EmptyBytes, | 309 | client.SendAvatarProperties(avatarID, String.Empty, "1/1/1970", Utils.EmptyBytes, |
310 | String.Empty, (uint)flags, UUID.Zero, UUID.Zero, String.Empty, UUID.Zero); | 310 | String.Empty, (uint)flags, UUID.Zero, UUID.Zero, String.Empty, UUID.Zero); |
311 | } | 311 | } |
@@ -342,7 +342,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
342 | 342 | ||
343 | private void UserInfoRequestHandler(IClientAPI client) | 343 | private void UserInfoRequestHandler(IClientAPI client) |
344 | { | 344 | { |
345 | m_log.Error("[PROFILES]: UserInfoRequestHandler"); | 345 | m_log.Error("[SIMIAN PROFILES]: UserInfoRequestHandler"); |
346 | 346 | ||
347 | // Fetch this user's e-mail address | 347 | // Fetch this user's e-mail address |
348 | NameValueCollection requestArgs = new NameValueCollection | 348 | NameValueCollection requestArgs = new NameValueCollection |
@@ -355,14 +355,14 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
355 | string email = response["Email"].AsString(); | 355 | string email = response["Email"].AsString(); |
356 | 356 | ||
357 | if (!response["Success"].AsBoolean()) | 357 | if (!response["Success"].AsBoolean()) |
358 | m_log.Warn("[PROFILES]: GetUser failed during a user info request for " + client.Name); | 358 | m_log.Warn("[SIMIAN PROFILES]: GetUser failed during a user info request for " + client.Name); |
359 | 359 | ||
360 | client.SendUserInfoReply(false, true, email); | 360 | client.SendUserInfoReply(false, true, email); |
361 | } | 361 | } |
362 | 362 | ||
363 | private void UpdateUserInfoHandler(bool imViaEmail, bool visible, IClientAPI client) | 363 | private void UpdateUserInfoHandler(bool imViaEmail, bool visible, IClientAPI client) |
364 | { | 364 | { |
365 | m_log.Info("[PROFILES]: Ignoring user info update from " + client.Name); | 365 | m_log.Info("[SIMIAN PROFILES]: Ignoring user info update from " + client.Name); |
366 | } | 366 | } |
367 | 367 | ||
368 | #endregion Profiles | 368 | #endregion Profiles |
@@ -380,7 +380,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
380 | UserAccount admin = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, UUID.Zero); | 380 | UserAccount admin = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, UUID.Zero); |
381 | if (admin != null) | 381 | if (admin != null) |
382 | { | 382 | { |
383 | m_log.InfoFormat("[PROFILES]: Setting estate {0} (ID: {1}) owner to {2}", estate.EstateName, | 383 | m_log.InfoFormat("[SIMIAN PROFILES]: Setting estate {0} (ID: {1}) owner to {2}", estate.EstateName, |
384 | estate.EstateID, admin.Name); | 384 | estate.EstateID, admin.Name); |
385 | 385 | ||
386 | estate.EstateOwner = admin.PrincipalID; | 386 | estate.EstateOwner = admin.PrincipalID; |
@@ -388,7 +388,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
388 | } | 388 | } |
389 | else | 389 | else |
390 | { | 390 | { |
391 | m_log.WarnFormat("[PROFILES]: Estate {0} (ID: {1}) does not have an owner", estate.EstateName, estate.EstateID); | 391 | m_log.WarnFormat("[SIMIAN PROFILES]: Estate {0} (ID: {1}) does not have an owner", estate.EstateName, estate.EstateID); |
392 | } | 392 | } |
393 | } | 393 | } |
394 | } | 394 | } |
@@ -406,7 +406,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
406 | bool success = response["Success"].AsBoolean(); | 406 | bool success = response["Success"].AsBoolean(); |
407 | 407 | ||
408 | if (!success) | 408 | if (!success) |
409 | m_log.WarnFormat("[PROFILES]: Failed to add user data with key {0} for {1}: {2}", key, userID, response["Message"].AsString()); | 409 | m_log.WarnFormat("[SIMIAN PROFILES]: Failed to add user data with key {0} for {1}: {2}", key, userID, response["Message"].AsString()); |
410 | 410 | ||
411 | return success; | 411 | return success; |
412 | } | 412 | } |
@@ -426,7 +426,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
426 | } | 426 | } |
427 | else | 427 | else |
428 | { | 428 | { |
429 | m_log.Error("[PROFILES]: Failed to fetch user data for " + userID + ": " + response["Message"].AsString()); | 429 | m_log.Error("[SIMIAN PROFILES]: Failed to fetch user data for " + userID + ": " + response["Message"].AsString()); |
430 | } | 430 | } |
431 | 431 | ||
432 | return null; | 432 | return null; |