From 27d4e05f2b6deaf9cfdff36a98e02989e3f2cc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Liru=20F=C3=A6rs?= <lirusaito@gmail.com>
Date: Mon, 20 Jan 2020 20:03:23 -0500
Subject: [PATCH] Prevent crash 37

---
 indra/newview/wlfPanel_AdvSettings.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/indra/newview/wlfPanel_AdvSettings.cpp b/indra/newview/wlfPanel_AdvSettings.cpp
index 166355d8d..2b5c0b0b6 100644
--- a/indra/newview/wlfPanel_AdvSettings.cpp
+++ b/indra/newview/wlfPanel_AdvSettings.cpp
@@ -488,11 +488,14 @@ void wlfPanel_AdvSettings::onSimulatorFeaturesReceived(const LLUUID& region_id)
 
 void wlfPanel_AdvSettings::updateEditHoverEnabled()
 {
-	const LLViewerRegion* region = gAgent.getRegion();
-	bool enabled = region && region->avatarHoverHeightEnabled();
-	if (mHoverHeight) mHoverHeight->setEnabled(enabled);
-	if (enabled)
+	if (mHoverHeight)
 	{
-		syncFromPreferenceSetting(mHoverHeight);
+		const LLViewerRegion* region = gAgent.getRegion();
+		bool enabled = region && region->avatarHoverHeightEnabled();
+		mHoverHeight->setEnabled(enabled);
+		if (enabled)
+		{
+			syncFromPreferenceSetting(mHoverHeight);
+		}
 	}
 }