aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-16 01:53:25 +0100
committerJustin Clark-Casey (justincc)2011-07-16 01:53:25 +0100
commit61798793086e29eecca495b0163124fe51f1ba3c (patch)
tree73ed4a2b7cb0838d6e9eb4229eeebb4f01f1294e /OpenSim/Services
parentIf resized shape is a mesh/sculpt, leave it to the mesh asset callback to tri... (diff)
downloadopensim-SC_OLD-61798793086e29eecca495b0163124fe51f1ba3c.zip
opensim-SC_OLD-61798793086e29eecca495b0163124fe51f1ba3c.tar.gz
opensim-SC_OLD-61798793086e29eecca495b0163124fe51f1ba3c.tar.bz2
opensim-SC_OLD-61798793086e29eecca495b0163124fe51f1ba3c.tar.xz
minor: remove mono compiler warnings
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs71
1 files changed, 36 insertions, 35 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 6265bcd..08a3876 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -244,6 +244,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
244 { 244 {
245 m_log.Debug("[USER AGENT CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message); 245 m_log.Debug("[USER AGENT CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message);
246 } 246 }
247
247 // Add the input arguments 248 // Add the input arguments
248 args["gatekeeper_serveruri"] = OSD.FromString(gatekeeper.ServerURI); 249 args["gatekeeper_serveruri"] = OSD.FromString(gatekeeper.ServerURI);
249 args["gatekeeper_host"] = OSD.FromString(gatekeeper.ExternalHostName); 250 args["gatekeeper_host"] = OSD.FromString(gatekeeper.ExternalHostName);
@@ -429,7 +430,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
429 paramList.Add(hash); 430 paramList.Add(hash);
430 431
431 XmlRpcRequest request = new XmlRpcRequest("status_notification", paramList); 432 XmlRpcRequest request = new XmlRpcRequest("status_notification", paramList);
432 string reason = string.Empty; 433// string reason = string.Empty;
433 434
434 // Send and get reply 435 // Send and get reply
435 List<UUID> friendsOnline = new List<UUID>(); 436 List<UUID> friendsOnline = new List<UUID>();
@@ -438,17 +439,17 @@ namespace OpenSim.Services.Connectors.Hypergrid
438 { 439 {
439 response = request.Send(m_ServerURL, 6000); 440 response = request.Send(m_ServerURL, 6000);
440 } 441 }
441 catch (Exception e) 442 catch
442 { 443 {
443 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 444 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL);
444 reason = "Exception: " + e.Message; 445// reason = "Exception: " + e.Message;
445 return friendsOnline; 446 return friendsOnline;
446 } 447 }
447 448
448 if (response.IsFault) 449 if (response.IsFault)
449 { 450 {
450 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 451 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString);
451 reason = "XMLRPC Fault"; 452// reason = "XMLRPC Fault";
452 return friendsOnline; 453 return friendsOnline;
453 } 454 }
454 455
@@ -460,7 +461,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
460 if (hash == null) 461 if (hash == null)
461 { 462 {
462 m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetOnlineFriends Got null response from {0}! THIS IS BAAAAD", m_ServerURL); 463 m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetOnlineFriends Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
463 reason = "Internal error 1"; 464// reason = "Internal error 1";
464 return friendsOnline; 465 return friendsOnline;
465 } 466 }
466 467
@@ -476,10 +477,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
476 } 477 }
477 478
478 } 479 }
479 catch (Exception e) 480 catch
480 { 481 {
481 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetOnlineFriends response."); 482 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetOnlineFriends response.");
482 reason = "Exception: " + e.Message; 483// reason = "Exception: " + e.Message;
483 } 484 }
484 485
485 return friendsOnline; 486 return friendsOnline;
@@ -500,7 +501,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
500 paramList.Add(hash); 501 paramList.Add(hash);
501 502
502 XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList); 503 XmlRpcRequest request = new XmlRpcRequest("get_online_friends", paramList);
503 string reason = string.Empty; 504// string reason = string.Empty;
504 505
505 // Send and get reply 506 // Send and get reply
506 List<UUID> online = new List<UUID>(); 507 List<UUID> online = new List<UUID>();
@@ -509,17 +510,17 @@ namespace OpenSim.Services.Connectors.Hypergrid
509 { 510 {
510 response = request.Send(m_ServerURL, 10000); 511 response = request.Send(m_ServerURL, 10000);
511 } 512 }
512 catch (Exception e) 513 catch
513 { 514 {
514 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 515 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL);
515 reason = "Exception: " + e.Message; 516// reason = "Exception: " + e.Message;
516 return online; 517 return online;
517 } 518 }
518 519
519 if (response.IsFault) 520 if (response.IsFault)
520 { 521 {
521 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 522 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString);
522 reason = "XMLRPC Fault"; 523// reason = "XMLRPC Fault";
523 return online; 524 return online;
524 } 525 }
525 526
@@ -531,7 +532,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
531 if (hash == null) 532 if (hash == null)
532 { 533 {
533 m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetOnlineFriends Got null response from {0}! THIS IS BAAAAD", m_ServerURL); 534 m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetOnlineFriends Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
534 reason = "Internal error 1"; 535// reason = "Internal error 1";
535 return online; 536 return online;
536 } 537 }
537 538
@@ -547,10 +548,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
547 } 548 }
548 549
549 } 550 }
550 catch (Exception e) 551 catch
551 { 552 {
552 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetOnlineFriends response."); 553 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetOnlineFriends response.");
553 reason = "Exception: " + e.Message; 554// reason = "Exception: " + e.Message;
554 } 555 }
555 556
556 return online; 557 return online;
@@ -565,7 +566,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
565 paramList.Add(hash); 566 paramList.Add(hash);
566 567
567 XmlRpcRequest request = new XmlRpcRequest("get_server_urls", paramList); 568 XmlRpcRequest request = new XmlRpcRequest("get_server_urls", paramList);
568 string reason = string.Empty; 569// string reason = string.Empty;
569 570
570 // Send and get reply 571 // Send and get reply
571 Dictionary<string, object> serverURLs = new Dictionary<string,object>(); 572 Dictionary<string, object> serverURLs = new Dictionary<string,object>();
@@ -574,17 +575,17 @@ namespace OpenSim.Services.Connectors.Hypergrid
574 { 575 {
575 response = request.Send(m_ServerURL, 10000); 576 response = request.Send(m_ServerURL, 10000);
576 } 577 }
577 catch (Exception e) 578 catch
578 { 579 {
579 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 580 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL);
580 reason = "Exception: " + e.Message; 581// reason = "Exception: " + e.Message;
581 return serverURLs; 582 return serverURLs;
582 } 583 }
583 584
584 if (response.IsFault) 585 if (response.IsFault)
585 { 586 {
586 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 587 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString);
587 reason = "XMLRPC Fault"; 588// reason = "XMLRPC Fault";
588 return serverURLs; 589 return serverURLs;
589 } 590 }
590 591
@@ -596,7 +597,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
596 if (hash == null) 597 if (hash == null)
597 { 598 {
598 m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetServerURLs Got null response from {0}! THIS IS BAAAAD", m_ServerURL); 599 m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetServerURLs Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
599 reason = "Internal error 1"; 600// reason = "Internal error 1";
600 return serverURLs; 601 return serverURLs;
601 } 602 }
602 603
@@ -611,10 +612,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
611 } 612 }
612 613
613 } 614 }
614 catch (Exception e) 615 catch
615 { 616 {
616 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetOnlineFriends response."); 617 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on GetOnlineFriends response.");
617 reason = "Exception: " + e.Message; 618// reason = "Exception: " + e.Message;
618 } 619 }
619 620
620 return serverURLs; 621 return serverURLs;
@@ -629,7 +630,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
629 paramList.Add(hash); 630 paramList.Add(hash);
630 631
631 XmlRpcRequest request = new XmlRpcRequest("locate_user", paramList); 632 XmlRpcRequest request = new XmlRpcRequest("locate_user", paramList);
632 string reason = string.Empty; 633// string reason = string.Empty;
633 634
634 // Send and get reply 635 // Send and get reply
635 string url = string.Empty; 636 string url = string.Empty;
@@ -638,17 +639,17 @@ namespace OpenSim.Services.Connectors.Hypergrid
638 { 639 {
639 response = request.Send(m_ServerURL, 10000); 640 response = request.Send(m_ServerURL, 10000);
640 } 641 }
641 catch (Exception e) 642 catch
642 { 643 {
643 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 644 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL);
644 reason = "Exception: " + e.Message; 645// reason = "Exception: " + e.Message;
645 return url; 646 return url;
646 } 647 }
647 648
648 if (response.IsFault) 649 if (response.IsFault)
649 { 650 {
650 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 651 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString);
651 reason = "XMLRPC Fault"; 652// reason = "XMLRPC Fault";
652 return url; 653 return url;
653 } 654 }
654 655
@@ -660,7 +661,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
660 if (hash == null) 661 if (hash == null)
661 { 662 {
662 m_log.ErrorFormat("[USER AGENT CONNECTOR]: LocateUser Got null response from {0}! THIS IS BAAAAD", m_ServerURL); 663 m_log.ErrorFormat("[USER AGENT CONNECTOR]: LocateUser Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
663 reason = "Internal error 1"; 664// reason = "Internal error 1";
664 return url; 665 return url;
665 } 666 }
666 667
@@ -669,10 +670,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
669 url = hash["URL"].ToString(); 670 url = hash["URL"].ToString();
670 671
671 } 672 }
672 catch (Exception e) 673 catch
673 { 674 {
674 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on LocateUser response."); 675 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on LocateUser response.");
675 reason = "Exception: " + e.Message; 676// reason = "Exception: " + e.Message;
676 } 677 }
677 678
678 return url; 679 return url;
@@ -688,7 +689,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
688 paramList.Add(hash); 689 paramList.Add(hash);
689 690
690 XmlRpcRequest request = new XmlRpcRequest("get_uui", paramList); 691 XmlRpcRequest request = new XmlRpcRequest("get_uui", paramList);
691 string reason = string.Empty; 692// string reason = string.Empty;
692 693
693 // Send and get reply 694 // Send and get reply
694 string uui = string.Empty; 695 string uui = string.Empty;
@@ -697,17 +698,17 @@ namespace OpenSim.Services.Connectors.Hypergrid
697 { 698 {
698 response = request.Send(m_ServerURL, 10000); 699 response = request.Send(m_ServerURL, 10000);
699 } 700 }
700 catch (Exception e) 701 catch
701 { 702 {
702 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL); 703 m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL);
703 reason = "Exception: " + e.Message; 704// reason = "Exception: " + e.Message;
704 return uui; 705 return uui;
705 } 706 }
706 707
707 if (response.IsFault) 708 if (response.IsFault)
708 { 709 {
709 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString); 710 m_log.ErrorFormat("[USER AGENT CONNECTOR]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString);
710 reason = "XMLRPC Fault"; 711// reason = "XMLRPC Fault";
711 return uui; 712 return uui;
712 } 713 }
713 714
@@ -719,7 +720,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
719 if (hash == null) 720 if (hash == null)
720 { 721 {
721 m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetUUI Got null response from {0}! THIS IS BAAAAD", m_ServerURL); 722 m_log.ErrorFormat("[USER AGENT CONNECTOR]: GetUUI Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
722 reason = "Internal error 1"; 723// reason = "Internal error 1";
723 return uui; 724 return uui;
724 } 725 }
725 726
@@ -728,10 +729,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
728 uui = hash["UUI"].ToString(); 729 uui = hash["UUI"].ToString();
729 730
730 } 731 }
731 catch (Exception e) 732 catch
732 { 733 {
733 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on LocateUser response."); 734 m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got exception on LocateUser response.");
734 reason = "Exception: " + e.Message; 735// reason = "Exception: " + e.Message;
735 } 736 }
736 737
737 return uui; 738 return uui;