From 10c9f17301e2dbacb0105b29d7214e67d5de8e85 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Sat, 13 Feb 2010 13:40:45 +0000
Subject: CID-139

Checker: NULL_RETURNS
Function: LLPanelFaceSetTEFunctor::apply(LLViewerObject *, int)
File: /indra/newview/llpanelface.cpp
---
 indra/newview/llpanelface.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 4f450ce0a8..b50c6442e1 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -289,6 +289,9 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor
 		LLCheckBoxCtrl*	checkFlipScaleS = mPanel->getChild<LLCheckBoxCtrl>("checkbox flip s");
 		LLCheckBoxCtrl*	checkFlipScaleT = mPanel->getChild<LLCheckBoxCtrl>("checkbox flip t");
 		LLComboBox*		comboTexGen = mPanel->getChild<LLComboBox>("combobox texgen");
+		llassert(comboTexGen);
+		llassert(object);
+
 		if (ctrlTexScaleS)
 		{
 			valid = !ctrlTexScaleS->getTentative() || !checkFlipScaleS->getTentative();
@@ -299,7 +302,8 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor
 				{
 					value = -value;
 				}
-				if (comboTexGen->getCurrentIndex() == 1)
+				if (comboTexGen &&
+				    comboTexGen->getCurrentIndex() == 1)
 				{
 					value *= 0.5f;
 				}
@@ -317,7 +321,8 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor
 				{
 					value = -value;
 				}
-				if (comboTexGen->getCurrentIndex() == 1)
+				if (comboTexGen &&
+				    comboTexGen->getCurrentIndex() == 1)
 				{
 					value *= 0.5f;
 				}
-- 
cgit v1.2.3