aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorCinder2015-08-06 17:32:58 -0600
committerOren Hurvitz2015-08-07 07:42:26 +0100
commitf218cbd29d259fc5a0f8e0a9246e5ac4530cf00a (patch)
tree6670d74528a7ad62753d695ee120a03aa1d1200f /OpenSim/Services/LLLoginService/LLLoginService.cs
parentBulletSim: clean up some code for axis locking. No functional change. (diff)
downloadopensim-SC_OLD-f218cbd29d259fc5a0f8e0a9246e5ac4530cf00a.zip
opensim-SC_OLD-f218cbd29d259fc5a0f8e0a9246e5ac4530cf00a.tar.gz
opensim-SC_OLD-f218cbd29d259fc5a0f8e0a9246e5ac4530cf00a.tar.bz2
opensim-SC_OLD-f218cbd29d259fc5a0f8e0a9246e5ac4530cf00a.tar.xz
max-agent-groups support
Robust now tells viewers what the maximum number of groups is. Viewers show this limit to the users, and enforce it. The default is 42, which is what viewers had assumed was the maximum number before this update. Signed-off-by: Oren Hurvitz <orenh@kitely.com>
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 96f2621..65030a4 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -80,6 +80,7 @@ namespace OpenSim.Services.LLLoginService
80 protected string m_SearchURL; 80 protected string m_SearchURL;
81 protected string m_Currency; 81 protected string m_Currency;
82 protected string m_ClassifiedFee; 82 protected string m_ClassifiedFee;
83 protected int m_MaxAgentGroups;
83 protected string m_DestinationGuide; 84 protected string m_DestinationGuide;
84 protected string m_AvatarPicker; 85 protected string m_AvatarPicker;
85 protected string m_AllowedClients; 86 protected string m_AllowedClients;
@@ -127,6 +128,11 @@ namespace OpenSim.Services.LLLoginService
127 m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); 128 m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty);
128 m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time"); 129 m_DSTZone = m_LoginServerConfig.GetString("DSTZone", "America/Los_Angeles;Pacific Standard Time");
129 130
131 IConfig groupConfig = config.Configs["Groups"];
132 if (groupConfig != null)
133 m_MaxAgentGroups = groupConfig.GetInt("MaxAgentGroups", 42);
134
135
130 // Clean up some of these vars 136 // Clean up some of these vars
131 if (m_MapTileURL != String.Empty) 137 if (m_MapTileURL != String.Empty)
132 { 138 {
@@ -506,7 +512,7 @@ namespace OpenSim.Services.LLLoginService
506 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 512 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
507 where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP, 513 where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP,
508 m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone, 514 m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone,
509 m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee); 515 m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee, m_MaxAgentGroups);
510 516
511 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); 517 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
512 518