From 8bb6fbf8f0017f766a85e25d874bd671bdb6e6f1 Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 29 Oct 2020 15:56:41 +0000 Subject: [PATCH] FIRE-29279 - [OpenSim] Allow region configurable max prim size --- indra/newview/lfsimfeaturehandler.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/indra/newview/lfsimfeaturehandler.cpp b/indra/newview/lfsimfeaturehandler.cpp index 9c62b17010..735aaca03f 100644 --- a/indra/newview/lfsimfeaturehandler.cpp +++ b/indra/newview/lfsimfeaturehandler.cpp @@ -24,7 +24,7 @@ #include "llviewercontrol.h" #include "llviewernetwork.h" #include "llviewerregion.h" - +#include "llworld.h" // #include "llnotificationsutil.h" #include "tea.h" @@ -190,6 +190,21 @@ void LFSimFeatureHandler::setSupportedFeatures() mCurrencySymbolOverride = LLStringUtil::null; } // + // Adding feature extensions adopted from Aurora to OpenSim + auto regionSettings=LLWorld::getInstance(); + if(extras.has("MinPrimScale")) + { + regionSettings->setRegionMinPrimScale(extras["MinPrimScale"].asReal()); + } + if(extras.has("MaxPrimScale")) + { + regionSettings->setRegionMaxPrimScale(extras["MaxPrimScale"].asReal()); + regionSettings->setRegionMaxPrimScaleNoMesh(extras["MaxPrimScale"].asReal()); + } + if(extras.has("MaxPhysPrimScale")) + { + regionSettings->setMaxPhysPrimScale(extras["MaxPhysPrimScale"].asReal()); + } } else // OpenSim specifics are unsupported reset all to default { @@ -203,6 +218,7 @@ void LFSimFeatureHandler::setSupportedFeatures() mSimulatorFPSFactor = 1.f; mSimulatorFPSWarn = 30.f; mSimulatorFPSCrit = 20.f; + LLWorld::getInstance()->refreshLimits();// reset prim scales etc. if (LLLoginInstance::getInstance()->hasResponse("search")) {