diff options
Diffstat (limited to 'OpenSim/Framework/Communications/UserManagerBase.cs')
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 8e0b75c..5a62682 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -43,12 +43,12 @@ namespace OpenSim.Framework.Communications | |||
43 | /// </summary> | 43 | /// </summary> |
44 | public abstract class UserManagerBase : IUserService | 44 | public abstract class UserManagerBase : IUserService |
45 | { | 45 | { |
46 | private static readonly ILog m_log | 46 | private static readonly ILog m_log |
47 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | public UserConfig _config; | 49 | public UserConfig _config; |
50 | private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); | 50 | private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
53 | /// Adds a new user server plugin - user servers will be requested in the order they were loaded. | 53 | /// Adds a new user server plugin - user servers will be requested in the order they were loaded. |
54 | /// </summary> | 54 | /// </summary> |
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.Communications | |||
85 | m_log.Info("[USERSTORAGE]: Added IUserData Interface"); | 85 | m_log.Info("[USERSTORAGE]: Added IUserData Interface"); |
86 | } | 86 | } |
87 | 87 | ||
88 | #region Get UserProfile | 88 | #region Get UserProfile |
89 | 89 | ||
90 | // see IUserService | 90 | // see IUserService |
91 | public UserProfileData GetUserProfile(string fname, string lname) | 91 | public UserProfileData GetUserProfile(string fname, string lname) |
@@ -103,8 +103,8 @@ namespace OpenSim.Framework.Communications | |||
103 | 103 | ||
104 | return null; | 104 | return null; |
105 | } | 105 | } |
106 | 106 | ||
107 | // see IUserService | 107 | // see IUserService |
108 | public UserProfileData GetUserProfile(LLUUID uuid) | 108 | public UserProfileData GetUserProfile(LLUUID uuid) |
109 | { | 109 | { |
110 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 110 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
@@ -408,7 +408,7 @@ namespace OpenSim.Framework.Communications | |||
408 | 408 | ||
409 | profile.CurrentAgent = agent; | 409 | profile.CurrentAgent = agent; |
410 | } | 410 | } |
411 | 411 | ||
412 | /// <summary> | 412 | /// <summary> |
413 | /// Process a user logoff from OpenSim. | 413 | /// Process a user logoff from OpenSim. |
414 | /// </summary> | 414 | /// </summary> |
@@ -422,7 +422,7 @@ namespace OpenSim.Framework.Communications | |||
422 | { | 422 | { |
423 | if (StatsManager.UserStats != null) | 423 | if (StatsManager.UserStats != null) |
424 | StatsManager.UserStats.AddLogout(); | 424 | StatsManager.UserStats.AddLogout(); |
425 | 425 | ||
426 | UserProfileData userProfile; | 426 | UserProfileData userProfile; |
427 | UserAgentData userAgent; | 427 | UserAgentData userAgent; |
428 | LLVector3 currentPos = new LLVector3(posx, posy, posz); | 428 | LLVector3 currentPos = new LLVector3(posx, posy, posz); |
@@ -433,7 +433,7 @@ namespace OpenSim.Framework.Communications | |||
433 | { | 433 | { |
434 | // This line needs to be in side the above if statement or the UserServer will crash on some logouts. | 434 | // This line needs to be in side the above if statement or the UserServer will crash on some logouts. |
435 | m_log.Info("[LOGOUT]: " + userProfile.FirstName + " " + userProfile.SurName + " from " + regionhandle + "(" + posx + "," + posy + "," + posz + ")"); | 435 | m_log.Info("[LOGOUT]: " + userProfile.FirstName + " " + userProfile.SurName + " from " + regionhandle + "(" + posx + "," + posy + "," + posz + ")"); |
436 | 436 | ||
437 | userAgent = userProfile.CurrentAgent; | 437 | userAgent = userProfile.CurrentAgent; |
438 | if (userAgent != null) | 438 | if (userAgent != null) |
439 | { | 439 | { |
@@ -462,7 +462,7 @@ namespace OpenSim.Framework.Communications | |||
462 | m_log.Warn("[LOGOUT]: Unknown User logged out"); | 462 | m_log.Warn("[LOGOUT]: Unknown User logged out"); |
463 | } | 463 | } |
464 | } | 464 | } |
465 | 465 | ||
466 | public void CreateAgent(UserProfileData profile, LLSD request) | 466 | public void CreateAgent(UserProfileData profile, LLSD request) |
467 | { | 467 | { |
468 | UserAgentData agent = new UserAgentData(); | 468 | UserAgentData agent = new UserAgentData(); |
@@ -516,7 +516,7 @@ namespace OpenSim.Framework.Communications | |||
516 | #endregion | 516 | #endregion |
517 | 517 | ||
518 | /// <summary> | 518 | /// <summary> |
519 | /// | 519 | /// |
520 | /// </summary> | 520 | /// </summary> |
521 | /// <param name="user"></param> | 521 | /// <param name="user"></param> |
522 | public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) | 522 | public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) |
@@ -598,7 +598,7 @@ namespace OpenSim.Framework.Communications | |||
598 | 598 | ||
599 | /// Appearance | 599 | /// Appearance |
600 | /// TODO: stubs for now to get us to a compiling state gently | 600 | /// TODO: stubs for now to get us to a compiling state gently |
601 | public AvatarAppearance GetUserAppearance(LLUUID user) | 601 | public AvatarAppearance GetUserAppearance(LLUUID user) |
602 | { | 602 | { |
603 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 603 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
604 | { | 604 | { |
@@ -643,7 +643,7 @@ namespace OpenSim.Framework.Communications | |||
643 | } | 643 | } |
644 | } | 644 | } |
645 | } | 645 | } |
646 | 646 | ||
647 | public void RemoveAttachment(LLUUID user, LLUUID item) | 647 | public void RemoveAttachment(LLUUID user, LLUUID item) |
648 | { | 648 | { |
649 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 649 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
@@ -658,7 +658,7 @@ namespace OpenSim.Framework.Communications | |||
658 | } | 658 | } |
659 | } | 659 | } |
660 | } | 660 | } |
661 | 661 | ||
662 | public List<LLUUID> GetAttachments(LLUUID user) | 662 | public List<LLUUID> GetAttachments(LLUUID user) |
663 | { | 663 | { |
664 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 664 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |