aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs36
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 0e74f34..e7577c0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -43,11 +43,11 @@ namespace OpenSim.Region.Communications.OGS1
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 private CommunicationsManager m_parent; 46 private CommunicationsManager m_commsManager;
47 47
48 public OGS1UserServices(CommunicationsManager parent) 48 public OGS1UserServices(CommunicationsManager commsManager)
49 { 49 {
50 m_parent = parent; 50 m_commsManager = commsManager;
51 } 51 }
52 52
53 public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data) 53 public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Communications.OGS1
121 IList parameters = new ArrayList(); 121 IList parameters = new ArrayList();
122 parameters.Add(param); 122 parameters.Add(param);
123 XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters); 123 XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters);
124 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 6000); 124 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 6000);
125 Hashtable respData = (Hashtable) resp.Value; 125 Hashtable respData = (Hashtable) resp.Value;
126 if (respData.Contains("error_type")) 126 if (respData.Contains("error_type"))
127 { 127 {
@@ -258,7 +258,7 @@ namespace OpenSim.Region.Communications.OGS1
258 258
259 try 259 try
260 { 260 {
261 req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 261 req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
262 } 262 }
263 catch (WebException) 263 catch (WebException)
264 { 264 {
@@ -297,7 +297,7 @@ namespace OpenSim.Region.Communications.OGS1
297 IList parameters = new ArrayList(); 297 IList parameters = new ArrayList();
298 parameters.Add(param); 298 parameters.Add(param);
299 XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters); 299 XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters);
300 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 300 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
301 Hashtable respData = (Hashtable) resp.Value; 301 Hashtable respData = (Hashtable) resp.Value;
302 pickerlist = ConvertXMLRPCDataToAvatarPickerList(queryID, respData); 302 pickerlist = ConvertXMLRPCDataToAvatarPickerList(queryID, respData);
303 } 303 }
@@ -324,7 +324,7 @@ namespace OpenSim.Region.Communications.OGS1
324 IList parameters = new ArrayList(); 324 IList parameters = new ArrayList();
325 parameters.Add(param); 325 parameters.Add(param);
326 XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters); 326 XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
327 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 30000); 327 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
328 Hashtable respData = (Hashtable) resp.Value; 328 Hashtable respData = (Hashtable) resp.Value;
329 329
330 return ConvertXMLRPCDataToUserProfile(respData); 330 return ConvertXMLRPCDataToUserProfile(respData);
@@ -353,7 +353,7 @@ namespace OpenSim.Region.Communications.OGS1
353 IList parameters = new ArrayList(); 353 IList parameters = new ArrayList();
354 parameters.Add(param); 354 parameters.Add(param);
355 XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters); 355 XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
356 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 30000); 356 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
357 Hashtable respData = (Hashtable) resp.Value; 357 Hashtable respData = (Hashtable) resp.Value;
358 358
359 return ConvertXMLRPCDataToUserProfile(respData); 359 return ConvertXMLRPCDataToUserProfile(respData);
@@ -454,7 +454,7 @@ namespace OpenSim.Region.Communications.OGS1
454 parameters.Add(param); 454 parameters.Add(param);
455 455
456 XmlRpcRequest req = new XmlRpcRequest("update_user_profile", parameters); 456 XmlRpcRequest req = new XmlRpcRequest("update_user_profile", parameters);
457 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 457 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
458 Hashtable respData = (Hashtable)resp.Value; 458 Hashtable respData = (Hashtable)resp.Value;
459 if (respData != null) 459 if (respData != null)
460 { 460 {
@@ -500,7 +500,7 @@ namespace OpenSim.Region.Communications.OGS1
500 parameters.Add(param); 500 parameters.Add(param);
501 501
502 XmlRpcRequest req = new XmlRpcRequest("add_new_user_friend", parameters); 502 XmlRpcRequest req = new XmlRpcRequest("add_new_user_friend", parameters);
503 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 503 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
504 Hashtable respData = (Hashtable)resp.Value; 504 Hashtable respData = (Hashtable)resp.Value;
505 if (respData != null) 505 if (respData != null)
506 { 506 {
@@ -552,7 +552,7 @@ namespace OpenSim.Region.Communications.OGS1
552 parameters.Add(param); 552 parameters.Add(param);
553 553
554 XmlRpcRequest req = new XmlRpcRequest("remove_user_friend", parameters); 554 XmlRpcRequest req = new XmlRpcRequest("remove_user_friend", parameters);
555 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 555 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
556 Hashtable respData = (Hashtable)resp.Value; 556 Hashtable respData = (Hashtable)resp.Value;
557 if (respData != null) 557 if (respData != null)
558 { 558 {
@@ -604,7 +604,7 @@ namespace OpenSim.Region.Communications.OGS1
604 parameters.Add(param); 604 parameters.Add(param);
605 605
606 XmlRpcRequest req = new XmlRpcRequest("update_user_friend_perms", parameters); 606 XmlRpcRequest req = new XmlRpcRequest("update_user_friend_perms", parameters);
607 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 607 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
608 Hashtable respData = (Hashtable)resp.Value; 608 Hashtable respData = (Hashtable)resp.Value;
609 if (respData != null) 609 if (respData != null)
610 { 610 {
@@ -652,7 +652,7 @@ namespace OpenSim.Region.Communications.OGS1
652 IList parameters = new ArrayList(); 652 IList parameters = new ArrayList();
653 parameters.Add(param); 653 parameters.Add(param);
654 XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters); 654 XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
655 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); 655 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 8000);
656 Hashtable respData = (Hashtable) resp.Value; 656 Hashtable respData = (Hashtable) resp.Value;
657 657
658 if (respData.Contains("avcount")) 658 if (respData.Contains("avcount"))
@@ -686,14 +686,14 @@ namespace OpenSim.Region.Communications.OGS1
686 } 686 }
687 map["uuids"] = list; 687 map["uuids"] = list;
688 688
689 map["recv_key"] = m_parent.NetworkServersInfo.UserRecvKey; 689 map["recv_key"] = m_commsManager.NetworkServersInfo.UserRecvKey;
690 map["send_key"] = m_parent.NetworkServersInfo.UserSendKey; 690 map["send_key"] = m_commsManager.NetworkServersInfo.UserSendKey;
691 691
692 parameters.Add(map); 692 parameters.Add(map);
693 693
694 try { 694 try {
695 XmlRpcRequest req = new XmlRpcRequest("get_presence_info_bulk", parameters); 695 XmlRpcRequest req = new XmlRpcRequest("get_presence_info_bulk", parameters);
696 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.MessagingURL, 8000); 696 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.MessagingURL, 8000);
697 Hashtable respData = resp != null ? (Hashtable) resp.Value : null; 697 Hashtable respData = resp != null ? (Hashtable) resp.Value : null;
698 698
699 if (respData == null || respData.ContainsKey("faultMessage")) 699 if (respData == null || respData.ContainsKey("faultMessage"))
@@ -762,7 +762,7 @@ namespace OpenSim.Region.Communications.OGS1
762 IList parameters = new ArrayList(); 762 IList parameters = new ArrayList();
763 parameters.Add(param); 763 parameters.Add(param);
764 XmlRpcRequest req = new XmlRpcRequest("get_avatar_appearance", parameters); 764 XmlRpcRequest req = new XmlRpcRequest("get_avatar_appearance", parameters);
765 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); 765 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 8000);
766 Hashtable respData = (Hashtable) resp.Value; 766 Hashtable respData = (Hashtable) resp.Value;
767 767
768 return ConvertXMLRPCDataToAvatarAppearance(respData); 768 return ConvertXMLRPCDataToAvatarAppearance(respData);
@@ -785,7 +785,7 @@ namespace OpenSim.Region.Communications.OGS1
785 IList parameters = new ArrayList(); 785 IList parameters = new ArrayList();
786 parameters.Add(param); 786 parameters.Add(param);
787 XmlRpcRequest req = new XmlRpcRequest("update_avatar_appearance", parameters); 787 XmlRpcRequest req = new XmlRpcRequest("update_avatar_appearance", parameters);
788 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); 788 XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 8000);
789 Hashtable respData = (Hashtable) resp.Value; 789 Hashtable respData = (Hashtable) resp.Value;
790 790
791 if (respData != null) 791 if (respData != null)