1 files changed, 3 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;