aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-22 19:44:46 +0000
committerTeravus Ovares2008-02-22 19:44:46 +0000
commit582964800cc30e5ad08cf3be9a6a49fa96dd8b68 (patch)
tree02ef3aff1bfcbc3bca0d89663396f35e2963ca0a /OpenSim/Grid/UserServer
parent* Moved the EventManager over to delegate instances to prevent race conditions. (diff)
downloadopensim-SC_OLD-582964800cc30e5ad08cf3be9a6a49fa96dd8b68.zip
opensim-SC_OLD-582964800cc30e5ad08cf3be9a6a49fa96dd8b68.tar.gz
opensim-SC_OLD-582964800cc30e5ad08cf3be9a6a49fa96dd8b68.tar.bz2
opensim-SC_OLD-582964800cc30e5ad08cf3be9a6a49fa96dd8b68.tar.xz
* Moved all events except gridcomms and regioncomms over to Event Delegate instances to prevent event race conditions
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index e45aacf..80899e8 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -51,6 +51,8 @@ namespace OpenSim.Grid.UserServer
51 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 public event UserLoggedInAtLocation OnUserLoggedInAtLocation; 53 public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
54
55 private UserLoggedInAtLocation handler001 = null;
54 56
55 public UserConfig m_config; 57 public UserConfig m_config;
56 58
@@ -214,9 +216,10 @@ namespace OpenSim.Grid.UserServer
214 // Send 216 // Send
215 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 217 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
216 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 218 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
217 if (OnUserLoggedInAtLocation != null) 219 handler001 = OnUserLoggedInAtLocation;
220 if (handler001 != null)
218 { 221 {
219 OnUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos); 222 handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos);
220 } 223 }
221 } 224 }
222 225