aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2014-07-06 16:02:04 -0700
committerDiva Canto2014-07-06 16:02:04 -0700
commitba233008cd250e43ffad5e6cb5e1fed8a6e87f80 (patch)
tree07c830a17ea303f803a98513171774ae9c68e9f2
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-ba233008cd250e43ffad5e6cb5e1fed8a6e87f80.zip
opensim-SC_OLD-ba233008cd250e43ffad5e6cb5e1fed8a6e87f80.tar.gz
opensim-SC_OLD-ba233008cd250e43ffad5e6cb5e1fed8a6e87f80.tar.bz2
opensim-SC_OLD-ba233008cd250e43ffad5e6cb5e1fed8a6e87f80.tar.xz
Changed GetUserInfo so that the exposure of user account details is ruled by a configuration variable. It's on by default.
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs22
-rw-r--r--bin/Robust.HG.ini.example6
-rw-r--r--bin/config-include/StandaloneCommon.ini.example7
3 files changed, 30 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;
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index aaa78ff..c51a626 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -571,6 +571,12 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
571 ;; Leave blank or commented for no exceptions. 571 ;; Leave blank or commented for no exceptions.
572 ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" 572 ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
573 573
574 ;; This variable controls what is exposed to profiles of local users
575 ;; as seen from outside of this grid. Leave it uncommented for exposing
576 ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
577 ;; to block this info from being exposed.
578 ; ShowUserDetailsInHGProfile = True
579
574 580
575; * The interface that local users get when they are in other grids. 581; * The interface that local users get when they are in other grids.
576; * This restricts the inventory operations while in other grids. 582; * This restricts the inventory operations while in other grids.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index a368bb8..2bbc316 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -337,6 +337,13 @@
337 ;; Leave blank or commented for no exceptions. 337 ;; Leave blank or commented for no exceptions.
338 ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" 338 ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
339 339
340 ;; This variable controls what is exposed to profiles of local users
341 ;; as seen from outside of this grid. Leave it uncommented for exposing
342 ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
343 ;; to block this info from being exposed.
344 ; ShowUserDetailsInHGProfile = True
345
346
340[HGInventoryService] 347[HGInventoryService]
341 ;; If you have this set under [Hypergrid], no need to set it here, leave it commented 348 ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
342 ; HomeURI = "http://127.0.0.1:9000" 349 ; HomeURI = "http://127.0.0.1:9000"