From 536e38ad51b89808f26d8e3cd107fe093862d22a Mon Sep 17 00:00:00 2001
From: David Parks <davep@lindenlab.com>
Date: Tue, 22 Sep 2009 11:11:45 +0000
Subject: Merging render-pipeline-6-qa-2 into viewer-2

Self reviewed.
---
 indra/newview/llfloatersettingsdebug.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/llfloatersettingsdebug.cpp')

diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 616e9bac35..8979575ef7 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -111,6 +111,11 @@ void LLFloaterSettingsDebug::onCommitSettings()
 	LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
 	LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
 
+	if (!controlp)
+	{
+		return;
+	}
+
 	LLVector3 vector;
 	LLVector3d vectord;
 	LLRect rect;
-- 
cgit v1.2.3