aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs24
-rw-r--r--OpenSim/Services/Interfaces/IAvatarService.cs4
2 files changed, 13 insertions, 15 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 9c1f158..2c36bf5 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -439,14 +439,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
439 } 439 }
440 catch 440 catch
441 { 441 {
442 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 442 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for StatusNotification", m_ServerURL);
443// reason = "Exception: " + e.Message; 443// reason = "Exception: " + e.Message;
444 return friendsOnline; 444 return friendsOnline;
445 } 445 }
446 446
447 if (response.IsFault) 447 if (response.IsFault)
448 { 448 {
449 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 449 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for StatusNotification returned an error: {1}", m_ServerURL, response.FaultString);
450// reason = "XMLRPC Fault"; 450// reason = "XMLRPC Fault";
451 return friendsOnline; 451 return friendsOnline;
452 } 452 }
@@ -510,14 +510,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
510 } 510 }
511 catch 511 catch
512 { 512 {
513 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 513 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetOnlineFriends", m_ServerURL);
514// reason = "Exception: " + e.Message; 514// reason = "Exception: " + e.Message;
515 return online; 515 return online;
516 } 516 }
517 517
518 if (response.IsFault) 518 if (response.IsFault)
519 { 519 {
520 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 520 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetOnlineFriends returned an error: {1}", m_ServerURL, response.FaultString);
521// reason = "XMLRPC Fault"; 521// reason = "XMLRPC Fault";
522 return online; 522 return online;
523 } 523 }
@@ -575,14 +575,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
575 } 575 }
576 catch 576 catch
577 { 577 {
578 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 578 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetServerURLs", m_ServerURL);
579// reason = "Exception: " + e.Message; 579// reason = "Exception: " + e.Message;
580 return serverURLs; 580 return serverURLs;
581 } 581 }
582 582
583 if (response.IsFault) 583 if (response.IsFault)
584 { 584 {
585 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 585 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetServerURLs returned an error: {1}", m_ServerURL, response.FaultString);
586// reason = "XMLRPC Fault"; 586// reason = "XMLRPC Fault";
587 return serverURLs; 587 return serverURLs;
588 } 588 }
@@ -639,14 +639,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
639 } 639 }
640 catch 640 catch
641 { 641 {
642 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 642 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for LocateUser", m_ServerURL);
643// reason = "Exception: " + e.Message; 643// reason = "Exception: " + e.Message;
644 return url; 644 return url;
645 } 645 }
646 646
647 if (response.IsFault) 647 if (response.IsFault)
648 { 648 {
649 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 649 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for LocateUser returned an error: {1}", m_ServerURL, response.FaultString);
650// reason = "XMLRPC Fault"; 650// reason = "XMLRPC Fault";
651 return url; 651 return url;
652 } 652 }
@@ -698,14 +698,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
698 } 698 }
699 catch 699 catch
700 { 700 {
701 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 701 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetUUI", m_ServerURL);
702// reason = "Exception: " + e.Message; 702// reason = "Exception: " + e.Message;
703 return uui; 703 return uui;
704 } 704 }
705 705
706 if (response.IsFault) 706 if (response.IsFault)
707 { 707 {
708 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 708 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetUUI returned an error: {1}", m_ServerURL, response.FaultString);
709// reason = "XMLRPC Fault"; 709// reason = "XMLRPC Fault";
710 return uui; 710 return uui;
711 } 711 }
@@ -746,14 +746,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
746 } 746 }
747 catch (Exception e) 747 catch (Exception e)
748 { 748 {
749 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 749 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0} for GetBoolResponse", m_ServerURL);
750 reason = "Exception: " + e.Message; 750 reason = "Exception: " + e.Message;
751 return false; 751 return false;
752 } 752 }
753 753
754 if (response.IsFault) 754 if (response.IsFault)
755 { 755 {
756 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 756 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} for GetBoolResponse returned an error: {1}", m_ServerURL, response.FaultString);
757 reason = "XMLRPC Fault"; 757 reason = "XMLRPC Fault";
758 return false; 758 return false;
759 } 759 }
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 0d5ab7d..cda7113 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -262,7 +262,6 @@ namespace OpenSim.Services.Interfaces
262 UUID.Parse(Data["SkirtItem"]), 262 UUID.Parse(Data["SkirtItem"]),
263 UUID.Parse(Data["SkirtAsset"])); 263 UUID.Parse(Data["SkirtAsset"]));
264 264
265
266 if (Data.ContainsKey("VisualParams")) 265 if (Data.ContainsKey("VisualParams"))
267 { 266 {
268 string[] vps = Data["VisualParams"].Split(new char[] {','}); 267 string[] vps = Data["VisualParams"].Split(new char[] {','});
@@ -291,7 +290,6 @@ namespace OpenSim.Services.Interfaces
291 } 290 }
292 } 291 }
293 292
294
295 // Attachments 293 // Attachments
296 Dictionary<string, string> attchs = new Dictionary<string, string>(); 294 Dictionary<string, string> attchs = new Dictionary<string, string>();
297 foreach (KeyValuePair<string, string> _kvp in Data) 295 foreach (KeyValuePair<string, string> _kvp in Data)
@@ -308,7 +306,7 @@ namespace OpenSim.Services.Interfaces
308 UUID uuid = UUID.Zero; 306 UUID uuid = UUID.Zero;
309 UUID.TryParse(_kvp.Value, out uuid); 307 UUID.TryParse(_kvp.Value, out uuid);
310 308
311 appearance.SetAttachment(point,uuid,UUID.Zero); 309 appearance.SetAttachment(point, uuid, UUID.Zero);
312 } 310 }
313 311
314 if (appearance.Wearables[AvatarWearable.BODY].Count == 0) 312 if (appearance.Wearables[AvatarWearable.BODY].Count == 0)