From 571cf0d5cff465cfdbc27dbec9de3923030d020a Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Thu, 29 Oct 2020 15:42:38 +0000
Subject: [PATCH 1/3] FIRE-23523 Notifications with embeded URLs not clickable

---
 indra/llui/lltextbase.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 2278791af9..ab40ecc0c9 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -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

From 84e9907038556de3994fd8cbb43834e629329e41 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Thu, 29 Oct 2020 15:50:22 +0000
Subject: [PATCH 2/3] FIRE-22388 - Sync Materials setting doesn't

This is mostly down to the way that the setting is used, by making it non-persistent the damage is minimised, if users still confuse themselves it will revert on relog.
---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7243fd94af..8eb26d105a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -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>

From 8bb6fbf8f0017f766a85e25d874bd671bdb6e6f1 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Thu, 29 Oct 2020 15:56:41 +0000
Subject: [PATCH 3/3] 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"
 // <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"))
 			{