aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs52
2 files changed, 0 insertions, 58 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 06534be..084a9e9 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -120,11 +120,6 @@ namespace OpenSim.Region.Communications.Hypergrid
120 return GetUserProfile(firstName + " " + lastName); 120 return GetUserProfile(firstName + " " + lastName);
121 } 121 }
122 122
123 public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
124 {
125 m_remoteUserServices.UpdateUserCurrentRegion(avatarid, regionuuid, regionhandle);
126 }
127
128 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query) 123 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
129 { 124 {
130 return m_remoteUserServices.GenerateAgentPickerRequestResponse(queryID, query); 125 return m_remoteUserServices.GenerateAgentPickerRequestResponse(queryID, query);
@@ -150,7 +145,6 @@ namespace OpenSim.Region.Communications.Hypergrid
150 return m_remoteUserServices.GetUserProfile(avatarID); 145 return m_remoteUserServices.GetUserProfile(avatarID);
151 } 146 }
152 147
153
154 public void ClearUserAgent(UUID avatarID) 148 public void ClearUserAgent(UUID avatarID)
155 { 149 {
156 m_remoteUserServices.ClearUserAgent(avatarID); 150 m_remoteUserServices.ClearUserAgent(avatarID);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index af8d53e..0e74f34 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -285,58 +285,6 @@ namespace OpenSim.Region.Communications.OGS1
285 return GetUserProfile(firstName + " " + lastName); 285 return GetUserProfile(firstName + " " + lastName);
286 } 286 }
287 287
288 public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
289 {
290 Hashtable param = new Hashtable();
291 param.Add("avatar_id", avatarid.ToString());
292 param.Add("region_uuid", regionuuid.ToString());
293 param.Add("region_handle", regionhandle.ToString());
294 IList parameters = new ArrayList();
295 parameters.Add(param);
296 XmlRpcRequest req = new XmlRpcRequest("update_user_current_region", parameters);
297
298 XmlRpcResponse resp;
299
300 try
301 {
302 resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
303 }
304 catch(WebException)
305 {
306 m_log.Warn("[OSG1 USER SERVICES]: Grid not responding. Retrying.");
307
308 try
309 {
310 resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
311 }
312 catch (WebException)
313 {
314 m_log.Warn("[OSG1 USER SERVICES]: Grid not responding. Failed.");
315 return;
316 }
317 }
318
319 if (resp == null)
320 {
321 m_log.Warn("[OSG1 USER SERVICES]: Got no response, Grid server may not be updated.");
322 return;
323 }
324
325 Hashtable respData = (Hashtable)resp.Value;
326
327 if (respData == null || !respData.ContainsKey("returnString"))
328 {
329 m_log.Error("[OSG1 USER SERVICES]: Error updating user record, Grid server may not be updated.");
330 }
331 else
332 {
333 if ((string) respData["returnString"] != "TRUE")
334 {
335 m_log.Error("[OSG1 USER SERVICES]: Error updating user record");
336 }
337 }
338 }
339
340 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query) 288 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
341 { 289 {
342 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); 290 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();