2 files changed, 10 insertions, 1 deletions

diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index 3368ba4..d4c8efb 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -85,7 +85,9 @@ void HippoLimits::setOpenSimLimits()
 void HippoLimits::setSecondLifeLimits()
 {
         llinfos << "Using Second Life limits" << llendl;
-        mMaxAgentGroups = 25;
+        S32 max_groups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups();
+        mMaxAgentGroups = llmax(max_groups, 25);
+
         mMaxPrimScale = 10.0f;
         mMinPrimScale = 0.01f;
         mMaxHeight = 4096.0f;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4bfcf52..bd94a59 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1776,8 +1776,15 @@ bool idle_startup()
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRealCurrencySymbol(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("directory_fee");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setDirectoryFee(atoi(tmp.c_str()));
+
+                        //OpenSim
                         tmp = LLUserAuth::getInstance()->getResponse("max_groups");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str()));
+
+                        //SL
+                        tmp = LLUserAuth::getInstance()->getResponse("max-agent-groups");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str()));
+
                         tmp = LLUserAuth::getInstance()->getResponse("VoiceConnector");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setVoiceConnector(tmp);
                         gHippoGridManager->saveFile();