aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs42
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index e3ee2c1..63fad4a 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -117,8 +117,8 @@ namespace OpenSim.Region.Communications.OGS1
117 { 117 {
118 List<FriendListItem> buddylist = new List<FriendListItem>(); 118 List<FriendListItem> buddylist = new List<FriendListItem>();
119 int buddycount = Convert.ToInt32((string)data["avcount"]); 119 int buddycount = Convert.ToInt32((string)data["avcount"]);
120 120
121 121
122 for (int i = 0; i < buddycount; i++) 122 for (int i = 0; i < buddycount; i++)
123 { 123 {
124 FriendListItem buddylistitem = new FriendListItem(); 124 FriendListItem buddylistitem = new FriendListItem();
@@ -130,8 +130,8 @@ namespace OpenSim.Region.Communications.OGS1
130 130
131 buddylist.Add(buddylistitem); 131 buddylist.Add(buddylistitem);
132 } 132 }
133 133
134 134
135 return buddylist; 135 return buddylist;
136 } 136 }
137 137
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Communications.OGS1
201 /// Get a user profile from the user server 201 /// Get a user profile from the user server
202 /// </summary> 202 /// </summary>
203 /// <param name="avatarID"></param> 203 /// <param name="avatarID"></param>
204 /// <returns>null if the request fails</returns> 204 /// <returns>null if the request fails</returns>
205 public UserProfileData GetUserProfile(string name) 205 public UserProfileData GetUserProfile(string name)
206 { 206 {
207 try 207 try
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Communications.OGS1
222 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by name from remote user server: {0}", 222 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by name from remote user server: {0}",
223 e); 223 e);
224 } 224 }
225 225
226 return null; 226 return null;
227 } 227 }
228 228
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Communications.OGS1
251 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by uuid from remote user server: {0}", 251 "[OGS1 USER SERVICES]: Error when trying to fetch profile data by uuid from remote user server: {0}",
252 e); 252 e);
253 } 253 }
254 254
255 return null; 255 return null;
256 } 256 }
257 257
@@ -264,7 +264,7 @@ namespace OpenSim.Region.Communications.OGS1
264 /// Retrieve the user information for the given master uuid. 264 /// Retrieve the user information for the given master uuid.
265 /// </summary> 265 /// </summary>
266 /// <param name="uuid"></param> 266 /// <param name="uuid"></param>
267 /// <returns></returns> 267 /// <returns></returns>
268 public UserProfileData SetupMasterUser(string firstName, string lastName) 268 public UserProfileData SetupMasterUser(string firstName, string lastName)
269 { 269 {
270 return SetupMasterUser(firstName, lastName, String.Empty); 270 return SetupMasterUser(firstName, lastName, String.Empty);
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Communications.OGS1
274 /// Retrieve the user information for the given master uuid. 274 /// Retrieve the user information for the given master uuid.
275 /// </summary> 275 /// </summary>
276 /// <param name="uuid"></param> 276 /// <param name="uuid"></param>
277 /// <returns></returns> 277 /// <returns></returns>
278 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 278 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
279 { 279 {
280 UserProfileData profile = GetUserProfile(firstName, lastName); 280 UserProfileData profile = GetUserProfile(firstName, lastName);
@@ -289,13 +289,13 @@ namespace OpenSim.Region.Communications.OGS1
289 public UserProfileData SetupMasterUser(LLUUID uuid) 289 public UserProfileData SetupMasterUser(LLUUID uuid)
290 { 290 {
291 UserProfileData data = GetUserProfile(uuid); 291 UserProfileData data = GetUserProfile(uuid);
292 292
293 if (data == null) 293 if (data == null)
294 { 294 {
295 throw new Exception( 295 throw new Exception(
296 "Could not retrieve profile for master user " + uuid + ". User server did not respond to the request."); 296 "Could not retrieve profile for master user " + uuid + ". User server did not respond to the request.");
297 } 297 }
298 298
299 return data; 299 return data;
300 } 300 }
301 301
@@ -405,9 +405,9 @@ namespace OpenSim.Region.Communications.OGS1
405 { 405 {
406 m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " + 406 m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " +
407 e.Message); 407 e.Message);
408 408
409 } 409 }
410 410
411 } 411 }
412 412
413 /// <summary> 413 /// <summary>
@@ -422,7 +422,7 @@ namespace OpenSim.Region.Communications.OGS1
422 Hashtable param = new Hashtable(); 422 Hashtable param = new Hashtable();
423 param["ownerID"] = friendlistowner.UUID.ToString(); 423 param["ownerID"] = friendlistowner.UUID.ToString();
424 param["friendID"] = friend.UUID.ToString(); 424 param["friendID"] = friend.UUID.ToString();
425 425
426 426
427 IList parameters = new ArrayList(); 427 IList parameters = new ArrayList();
428 parameters.Add(param); 428 parameters.Add(param);
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Communications.OGS1
458 { 458 {
459 m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " + 459 m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " +
460 e.Message); 460 e.Message);
461 461
462 } 462 }
463 } 463 }
464 464
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Communications.OGS1
519 public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 519 public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner)
520 { 520 {
521 List<FriendListItem> buddylist = new List<FriendListItem>(); 521 List<FriendListItem> buddylist = new List<FriendListItem>();
522 522
523 try 523 try
524 { 524 {
525 Hashtable param = new Hashtable(); 525 Hashtable param = new Hashtable();
@@ -531,11 +531,11 @@ namespace OpenSim.Region.Communications.OGS1
531 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000); 531 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000);
532 Hashtable respData = (Hashtable) resp.Value; 532 Hashtable respData = (Hashtable) resp.Value;
533 533
534 if (respData.Contains("avcount")) 534 if (respData.Contains("avcount"))
535 { 535 {
536 buddylist = ConvertXMLRPCDataToFriendListItemList(respData); 536 buddylist = ConvertXMLRPCDataToFriendListItemList(respData);
537 } 537 }
538 538
539 } 539 }
540 catch (WebException e) 540 catch (WebException e)
541 { 541 {
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Communications.OGS1
550 550
551 /// Appearance 551 /// Appearance
552 /// TODO: stubs for now to get us to a compiling state gently 552 /// TODO: stubs for now to get us to a compiling state gently
553 public AvatarAppearance GetUserAppearance(LLUUID user) 553 public AvatarAppearance GetUserAppearance(LLUUID user)
554 { 554 {
555 return new AvatarAppearance(); 555 return new AvatarAppearance();
556 } 556 }
@@ -564,12 +564,12 @@ namespace OpenSim.Region.Communications.OGS1
564 { 564 {
565 return; 565 return;
566 } 566 }
567 567
568 public void RemoveAttachment(LLUUID user, LLUUID item) 568 public void RemoveAttachment(LLUUID user, LLUUID item)
569 { 569 {
570 return; 570 return;
571 } 571 }
572 572
573 public List<LLUUID> GetAttachments(LLUUID user) 573 public List<LLUUID> GetAttachments(LLUUID user)
574 { 574 {
575 return new List<LLUUID>(); 575 return new List<LLUUID>();