aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-07-30 22:13:21 +0000
committerAdam Frisby2007-07-30 22:13:21 +0000
commit7db7ad07222b54c17745d1d09f9d9546942c4a6f (patch)
treea43b3eb11f4bb469b2fff4e61450b23368aa142d
parent* Added GetLocalHost() to Util (diff)
downloadopensim-SC_OLD-7db7ad07222b54c17745d1d09f9d9546942c4a6f.zip
opensim-SC_OLD-7db7ad07222b54c17745d1d09f9d9546942c4a6f.tar.gz
opensim-SC_OLD-7db7ad07222b54c17745d1d09f9d9546942c4a6f.tar.bz2
opensim-SC_OLD-7db7ad07222b54c17745d1d09f9d9546942c4a6f.tar.xz
* Fixed a bug where the simulator could crash if the userserver was particularly busy.
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index a1f31bb..cd9c4fe 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -47,8 +47,8 @@ namespace OpenSim.Region.Communications.OGS1
47 } 47 }
48 public UserProfileData GetUserProfile(string name) 48 public UserProfileData GetUserProfile(string name)
49 { 49 {
50 //try 50 try
51 //{ 51 {
52 Hashtable param = new Hashtable(); 52 Hashtable param = new Hashtable();
53 param["avatar_name"] = name; 53 param["avatar_name"] = name;
54 IList parameters = new ArrayList(); 54 IList parameters = new ArrayList();
@@ -58,12 +58,12 @@ namespace OpenSim.Region.Communications.OGS1
58 Hashtable respData = (Hashtable)resp.Value; 58 Hashtable respData = (Hashtable)resp.Value;
59 59
60 return ConvertXMLRPCDataToUserProfile(respData); 60 return ConvertXMLRPCDataToUserProfile(respData);
61 //} 61 }
62 //catch (Exception e) 62 catch (System.Net.WebException e)
63 //{ 63 {
64 // Console.WriteLine("Error when trying to fetch profile data by name from remote user server: " + e.Message); 64 OpenSim.Framework.Console.MainLog.Instance.Warn("Error when trying to fetch profile data by name from remote user server: " + e.Message);
65 //} 65 }
66 //return null; 66 return null;
67 } 67 }
68 public UserProfileData GetUserProfile(LLUUID avatarID) 68 public UserProfileData GetUserProfile(LLUUID avatarID)
69 { 69 {