diff options
author | Charles Krinke | 2008-03-02 22:28:48 +0000 |
---|---|---|
committer | Charles Krinke | 2008-03-02 22:28:48 +0000 |
commit | 7794fc3766a71f6c708b53674064f69279434d1e (patch) | |
tree | 0a0f8ec8f81f2afa68dfaaa8450c08f0b203d77c /OpenSim/Grid/UserServer | |
parent | Thank you kindly, Ahzzmandius for adding (diff) | |
download | opensim-SC-7794fc3766a71f6c708b53674064f69279434d1e.zip opensim-SC-7794fc3766a71f6c708b53674064f69279434d1e.tar.gz opensim-SC-7794fc3766a71f6c708b53674064f69279434d1e.tar.bz2 opensim-SC-7794fc3766a71f6c708b53674064f69279434d1e.tar.xz |
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.
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 14 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 8 |
2 files changed, 11 insertions, 11 deletions
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 | |||
54 | 54 | ||
55 | public event UserLoggedInAtLocation OnUserLoggedInAtLocation; | 55 | public event UserLoggedInAtLocation OnUserLoggedInAtLocation; |
56 | 56 | ||
57 | private UserLoggedInAtLocation handler001 = null; | 57 | private UserLoggedInAtLocation handlerUserLoggedInAtLocation = null; |
58 | 58 | ||
59 | public UserConfig m_config; | 59 | public UserConfig m_config; |
60 | 60 | ||
@@ -147,11 +147,11 @@ namespace OpenSim.Grid.UserServer | |||
147 | "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", | 147 | "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", |
148 | SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString); | 148 | SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString); |
149 | } | 149 | } |
150 | handler001 = OnUserLoggedInAtLocation; | 150 | handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation; |
151 | if (handler001 != null) | 151 | if (handlerUserLoggedInAtLocation != null) |
152 | { | 152 | { |
153 | m_log.Info("[LOGIN]: Letting other objects know about login"); | 153 | m_log.Info("[LOGIN]: Letting other objects know about login"); |
154 | handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, | 154 | handlerUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, |
155 | theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X,theUser.currentAgent.currentPos.Y,theUser.currentAgent.currentPos.Z, | 155 | theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X,theUser.currentAgent.currentPos.Y,theUser.currentAgent.currentPos.Z, |
156 | theUser.username,theUser.surname); | 156 | theUser.username,theUser.surname); |
157 | } | 157 | } |
@@ -226,11 +226,11 @@ namespace OpenSim.Grid.UserServer | |||
226 | // Send | 226 | // Send |
227 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); | 227 | XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); |
228 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); | 228 | XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); |
229 | handler001 = OnUserLoggedInAtLocation; | 229 | handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation; |
230 | if (handler001 != null) | 230 | if (handlerUserLoggedInAtLocation != null) |
231 | { | 231 | { |
232 | m_log.Info("[LOGIN]: Letting other objects know about login"); | 232 | m_log.Info("[LOGIN]: Letting other objects know about login"); |
233 | handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, | 233 | handlerUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, |
234 | theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X, theUser.currentAgent.currentPos.Y, theUser.currentAgent.currentPos.Z, | 234 | theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X, theUser.currentAgent.currentPos.Y, theUser.currentAgent.currentPos.Z, |
235 | theUser.username, theUser.surname); | 235 | theUser.username, theUser.surname); |
236 | } | 236 | } |
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 | |||
43 | { | 43 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
45 | public event logOffUser OnLogOffUser; | 45 | public event logOffUser OnLogOffUser; |
46 | private logOffUser handler001 = null; | 46 | private logOffUser handlerLogOffUser = null; |
47 | /// <summary> | 47 | /// <summary> |
48 | /// Deletes an active agent session | 48 | /// Deletes an active agent session |
49 | /// </summary> | 49 | /// </summary> |
@@ -331,9 +331,9 @@ namespace OpenSim.Grid.UserServer | |||
331 | float posy = (float)Convert.ToDecimal((string)requestData["region_pos_y"]); | 331 | float posy = (float)Convert.ToDecimal((string)requestData["region_pos_y"]); |
332 | float posz = (float)Convert.ToDecimal((string)requestData["region_pos_z"]); | 332 | float posz = (float)Convert.ToDecimal((string)requestData["region_pos_z"]); |
333 | 333 | ||
334 | handler001 = OnLogOffUser; | 334 | handlerLogOffUser = OnLogOffUser; |
335 | if (handler001 != null) | 335 | if (handlerLogOffUser != null) |
336 | handler001(userUUID); | 336 | handlerLogOffUser(userUUID); |
337 | 337 | ||
338 | LogOffUser(userUUID, RegionID, regionhandle, posx, posy, posz); | 338 | LogOffUser(userUUID, RegionID, regionhandle, posx, posy, posz); |
339 | } | 339 | } |