aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-29 17:16:38 +0000
committerTeravus Ovares2008-01-29 17:16:38 +0000
commit8aa796595ccd0518644e61eccf5704761a609fd3 (patch)
tree6581fbf7ba8ca955dee1c386a9be2496ac5605d8
parent* Implemented grab and throw in ODE. It's a little strong still so toss gent... (diff)
downloadopensim-SC-8aa796595ccd0518644e61eccf5704761a609fd3.zip
opensim-SC-8aa796595ccd0518644e61eccf5704761a609fd3.tar.gz
opensim-SC-8aa796595ccd0518644e61eccf5704761a609fd3.tar.bz2
opensim-SC-8aa796595ccd0518644e61eccf5704761a609fd3.tar.xz
* Fixed a crash if the server is unable to connect to the UserServer when a user logs off
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 2cf3665..70b7e89 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -152,7 +152,15 @@ namespace OpenSim.Region.Communications.OGS1
152 IList parameters = new ArrayList(); 152 IList parameters = new ArrayList();
153 parameters.Add(param); 153 parameters.Add(param);
154 XmlRpcRequest req = new XmlRpcRequest("logout_of_simulator", parameters); 154 XmlRpcRequest req = new XmlRpcRequest("logout_of_simulator", parameters);
155 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000); 155 try
156 {
157 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
158 }
159 catch (System.Net.WebException)
160 {
161 MainLog.Instance.Warn("LOGOFF", "Unable to notify grid server of user logoff");
162 }
163
156 164
157 } 165 }
158 public UserProfileData GetUserProfile(string firstName, string lastName) 166 public UserProfileData GetUserProfile(string firstName, string lastName)