From 591ee456bab266e55be9c72968e38823427b02b8 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 14 Jan 2011 19:16:31 +0100
Subject: postfix: new maximum number of groups in SL.

---
 linden/indra/newview/hippoLimits.cpp | 4 +++-
 linden/indra/newview/llstartup.cpp   | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/hippoLimits.cpp b/linden/indra/newview/hippoLimits.cpp
index 92e2ed3..211fa5d 100644
--- a/linden/indra/newview/hippoLimits.cpp
+++ b/linden/indra/newview/hippoLimits.cpp
@@ -65,7 +65,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 592e938..3c8f810 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1718,8 +1718,14 @@ 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();
-- 
cgit v1.1