From 7794fc3766a71f6c708b53674064f69279434d1e Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Sun, 2 Mar 2008 22:28:48 +0000 Subject: Change handler001 through handler009 to more appropriate names consisten with their use. All done with all 94 handlers from handler001 through handler094. Hopefully we can move forward without numbered handlers. --- OpenSim/Grid/UserServer/UserLoginService.cs | 14 +++++++------- OpenSim/Grid/UserServer/UserManager.cs | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'OpenSim/Grid') diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 143c990..0b832f4 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -54,7 +54,7 @@ namespace OpenSim.Grid.UserServer public event UserLoggedInAtLocation OnUserLoggedInAtLocation; - private UserLoggedInAtLocation handler001 = null; + private UserLoggedInAtLocation handlerUserLoggedInAtLocation = null; public UserConfig m_config; @@ -147,11 +147,11 @@ namespace OpenSim.Grid.UserServer "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString); } - handler001 = OnUserLoggedInAtLocation; - if (handler001 != null) + handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation; + if (handlerUserLoggedInAtLocation != null) { m_log.Info("[LOGIN]: Letting other objects know about login"); - handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, + handlerUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X,theUser.currentAgent.currentPos.Y,theUser.currentAgent.currentPos.Z, theUser.username,theUser.surname); } @@ -226,11 +226,11 @@ namespace OpenSim.Grid.UserServer // Send XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); - handler001 = OnUserLoggedInAtLocation; - if (handler001 != null) + handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation; + if (handlerUserLoggedInAtLocation != null) { m_log.Info("[LOGIN]: Letting other objects know about login"); - handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, + handlerUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X, theUser.currentAgent.currentPos.Y, theUser.currentAgent.currentPos.Z, theUser.username, theUser.surname); } diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 5806f5f..367b5d7 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs @@ -43,7 +43,7 @@ namespace OpenSim.Grid.UserServer { private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); public event logOffUser OnLogOffUser; - private logOffUser handler001 = null; + private logOffUser handlerLogOffUser = null; /// /// Deletes an active agent session /// @@ -331,9 +331,9 @@ namespace OpenSim.Grid.UserServer float posy = (float)Convert.ToDecimal((string)requestData["region_pos_y"]); float posz = (float)Convert.ToDecimal((string)requestData["region_pos_z"]); - handler001 = OnLogOffUser; - if (handler001 != null) - handler001(userUUID); + handlerLogOffUser = OnLogOffUser; + if (handlerLogOffUser != null) + handlerLogOffUser(userUUID); LogOffUser(userUUID, RegionID, regionhandle, posx, posy, posz); } -- cgit v1.1