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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
Ansariel 2020-10-29 17:46:54 +01:00
parent 5609fdbf3d 8bb6fbf8f0
commit c201201be4
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/lltextbase.cpp
View File

@ -1139,7 +1139,10 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask)
{
LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
if (hasMouseCapture() && cur_segment && cur_segment->handleMouseUp(x, y, mask))
// <FS:Beq> FIRE-23523 left click does not work on notifications with embedded links
// if (hasMouseCapture() && cur_segment && cur_segment->handleMouseUp(x, y, mask))
if (cur_segment && cur_segment->handleMouseUp(x, y, mask))
// </FS:Beq>
{
// Did we just click on a link?
if (mURLClickSignal

2
indra/newview/app_settings/settings.xml
View File

@ -15203,7 +15203,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Comment</key>
<string>SyncMaterialSettings</string>
<key>Persist</key>
<integer>1</integer>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>

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"))
{