diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Grid/UserServer/UserManager.cs | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Grid/UserServer/UserManager.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 2a53d7b..aa2c959 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -28,11 +28,12 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | ||
31 | using System.Text.RegularExpressions; | 32 | using System.Text.RegularExpressions; |
32 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | ||
33 | using Nwc.XmlRpc; | 35 | using Nwc.XmlRpc; |
34 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Statistics; | ||
36 | using OpenSim.Framework.UserManagement; | 37 | using OpenSim.Framework.UserManagement; |
37 | 38 | ||
38 | namespace OpenSim.Grid.UserServer | 39 | namespace OpenSim.Grid.UserServer |
@@ -41,7 +42,7 @@ namespace OpenSim.Grid.UserServer | |||
41 | 42 | ||
42 | public class UserManager : UserManagerBase | 43 | public class UserManager : UserManagerBase |
43 | { | 44 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 46 | ||
46 | public event logOffUser OnLogOffUser; | 47 | public event logOffUser OnLogOffUser; |
47 | private logOffUser handlerLogOffUser = null; | 48 | private logOffUser handlerLogOffUser = null; |
@@ -389,7 +390,7 @@ namespace OpenSim.Grid.UserServer | |||
389 | { | 390 | { |
390 | userProfile.HomeLocationX = (float)Convert.ToDecimal((string)requestData["home_pos_x"]); | 391 | userProfile.HomeLocationX = (float)Convert.ToDecimal((string)requestData["home_pos_x"]); |
391 | } | 392 | } |
392 | catch (System.InvalidCastException) | 393 | catch (InvalidCastException) |
393 | { | 394 | { |
394 | m_log.Error("[PROFILE]:Failed to set home postion x"); | 395 | m_log.Error("[PROFILE]:Failed to set home postion x"); |
395 | } | 396 | } |
@@ -401,7 +402,7 @@ namespace OpenSim.Grid.UserServer | |||
401 | { | 402 | { |
402 | userProfile.HomeLocationY = (float)Convert.ToDecimal((string)requestData["home_pos_y"]); | 403 | userProfile.HomeLocationY = (float)Convert.ToDecimal((string)requestData["home_pos_y"]); |
403 | } | 404 | } |
404 | catch (System.InvalidCastException) | 405 | catch (InvalidCastException) |
405 | { | 406 | { |
406 | m_log.Error("[PROFILE]:Failed to set home postion y"); | 407 | m_log.Error("[PROFILE]:Failed to set home postion y"); |
407 | } | 408 | } |
@@ -412,7 +413,7 @@ namespace OpenSim.Grid.UserServer | |||
412 | { | 413 | { |
413 | userProfile.HomeLocationZ = (float)Convert.ToDecimal((string)requestData["home_pos_z"]); | 414 | userProfile.HomeLocationZ = (float)Convert.ToDecimal((string)requestData["home_pos_z"]); |
414 | } | 415 | } |
415 | catch (System.InvalidCastException) | 416 | catch (InvalidCastException) |
416 | { | 417 | { |
417 | m_log.Error("[PROFILE]:Failed to set home postion z"); | 418 | m_log.Error("[PROFILE]:Failed to set home postion z"); |
418 | } | 419 | } |
@@ -423,7 +424,7 @@ namespace OpenSim.Grid.UserServer | |||
423 | { | 424 | { |
424 | userProfile.HomeLookAtX = (float)Convert.ToDecimal((string)requestData["home_look_x"]); | 425 | userProfile.HomeLookAtX = (float)Convert.ToDecimal((string)requestData["home_look_x"]); |
425 | } | 426 | } |
426 | catch (System.InvalidCastException) | 427 | catch (InvalidCastException) |
427 | { | 428 | { |
428 | m_log.Error("[PROFILE]:Failed to set home lookat x"); | 429 | m_log.Error("[PROFILE]:Failed to set home lookat x"); |
429 | } | 430 | } |
@@ -434,7 +435,7 @@ namespace OpenSim.Grid.UserServer | |||
434 | { | 435 | { |
435 | userProfile.HomeLookAtY = (float)Convert.ToDecimal((string)requestData["home_look_y"]); | 436 | userProfile.HomeLookAtY = (float)Convert.ToDecimal((string)requestData["home_look_y"]); |
436 | } | 437 | } |
437 | catch (System.InvalidCastException) | 438 | catch (InvalidCastException) |
438 | { | 439 | { |
439 | m_log.Error("[PROFILE]:Failed to set home lookat y"); | 440 | m_log.Error("[PROFILE]:Failed to set home lookat y"); |
440 | } | 441 | } |
@@ -445,7 +446,7 @@ namespace OpenSim.Grid.UserServer | |||
445 | { | 446 | { |
446 | userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]); | 447 | userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]); |
447 | } | 448 | } |
448 | catch (System.InvalidCastException) | 449 | catch (InvalidCastException) |
449 | { | 450 | { |
450 | m_log.Error("[PROFILE]:Failed to set home lookat z"); | 451 | m_log.Error("[PROFILE]:Failed to set home lookat z"); |
451 | } | 452 | } |