From 8d76b798c96913efe8dc65cf28008a0a49d5c9c7 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 21 Jul 2015 03:59:31 -0400
Subject: [PATCH] Fix a crash that was possible when teleporting without quick
 settings having been opened.

---
 indra/newview/wlfPanel_AdvSettings.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/wlfPanel_AdvSettings.cpp b/indra/newview/wlfPanel_AdvSettings.cpp
index fa0a1b693..b105d22a2 100644
--- a/indra/newview/wlfPanel_AdvSettings.cpp
+++ b/indra/newview/wlfPanel_AdvSettings.cpp
@@ -222,6 +222,10 @@ BOOL wlfPanel_AdvSettings::postBuild()
 		// Set up based on initial region.
 		onRegionChanged();
 	}
+	else
+	{
+		mHoverHeight = NULL;
+	}
 	return TRUE;
 }
 
@@ -513,7 +517,7 @@ void wlfPanel_AdvSettings::updateEditHoverEnabled()
 {
 	const LLViewerRegion* region = gAgent.getRegion();
 	bool enabled = region && region->avatarHoverHeightEnabled();
-	mHoverHeight->setEnabled(enabled);
+	if (mHoverHeight) mHoverHeight->setEnabled(enabled);
 	if (enabled)
 	{
 		syncFromPreferenceSetting(mHoverHeight);