livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-29279 - [OpenSim] Allow region configurable max prim size

meow-7.2.2
Beq 2020-10-29 15:56:41 +00:00
parent 84e9907038
commit 8bb6fbf8f0
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/lfsimfeaturehandler.cpp
View File

@ -24,7 +24,7 @@
#include "llviewercontrol.h"
#include "llviewernetwork.h"
#include "llviewerregion.h"
#include "llworld.h"
// <COLOSI opensim multi-currency support>
#include "llnotificationsutil.h"
#include "tea.h"
@ -190,6 +190,21 @@ void LFSimFeatureHandler::setSupportedFeatures()
mCurrencySymbolOverride = LLStringUtil::null;
}
// </COLOSI opensim multi-currency support>
// 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"))
{