diff options
author | Diva Canto | 2014-07-06 16:02:04 -0700 |
---|---|---|
committer | Diva Canto | 2014-07-06 16:02:04 -0700 |
commit | ba233008cd250e43ffad5e6cb5e1fed8a6e87f80 (patch) | |
tree | 07c830a17ea303f803a98513171774ae9c68e9f2 /OpenSim/Services | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-ba233008cd250e43ffad5e6cb5e1fed8a6e87f80.zip opensim-SC-ba233008cd250e43ffad5e6cb5e1fed8a6e87f80.tar.gz opensim-SC-ba233008cd250e43ffad5e6cb5e1fed8a6e87f80.tar.bz2 opensim-SC-ba233008cd250e43ffad5e6cb5e1fed8a6e87f80.tar.xz |
Changed GetUserInfo so that the exposure of user account details is ruled by a configuration variable. It's on by default.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 6dbb50d..c65122a 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -75,6 +75,7 @@ namespace OpenSim.Services.HypergridService | |||
75 | protected static string m_GridName; | 75 | protected static string m_GridName; |
76 | 76 | ||
77 | protected static int m_LevelOutsideContacts; | 77 | protected static int m_LevelOutsideContacts; |
78 | protected static bool m_ShowDetails; | ||
78 | 79 | ||
79 | protected static bool m_BypassClientVerification; | 80 | protected static bool m_BypassClientVerification; |
80 | 81 | ||
@@ -128,6 +129,7 @@ namespace OpenSim.Services.HypergridService | |||
128 | m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountService, args); | 129 | m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountService, args); |
129 | 130 | ||
130 | m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0); | 131 | m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0); |
132 | m_ShowDetails = serverConfig.GetBoolean("ShowUserDetailsInHGProfile", true); | ||
131 | 133 | ||
132 | LoadTripPermissionsFromConfig(serverConfig, "ForeignTripsAllowed"); | 134 | LoadTripPermissionsFromConfig(serverConfig, "ForeignTripsAllowed"); |
133 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions); | 135 | LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions); |
@@ -571,12 +573,22 @@ namespace OpenSim.Services.HypergridService | |||
571 | 573 | ||
572 | if (account != null) | 574 | if (account != null) |
573 | { | 575 | { |
574 | info.Add("user_flags", (object)account.UserFlags); | 576 | info.Add("user_firstname", account.FirstName); |
575 | info.Add("user_created", (object)account.Created); | 577 | info.Add("user_lastname", account.LastName); |
576 | info.Add("user_title", (object)account.UserTitle); | ||
577 | info.Add("user_firstname", (object)account.FirstName); | ||
578 | info.Add("user_lastname", (object)account.LastName); | ||
579 | info.Add("result", "success"); | 578 | info.Add("result", "success"); |
579 | |||
580 | if (m_ShowDetails) | ||
581 | { | ||
582 | info.Add("user_flags", account.UserFlags); | ||
583 | info.Add("user_created", account.Created); | ||
584 | info.Add("user_title", account.UserTitle); | ||
585 | } | ||
586 | else | ||
587 | { | ||
588 | info.Add("user_flags", 0); | ||
589 | info.Add("user_created", 0); | ||
590 | info.Add("user_title", string.Empty); | ||
591 | } | ||
580 | } | 592 | } |
581 | 593 | ||
582 | return info; | 594 | return info; |