Merge remote branch 'shyotl/master'

2010-11-18 23:53:59 +01:00
parent c73e2713b5 3cbec60562
commit 7f61885ba5
4 changed files with 19 additions and 11 deletions
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -141,6 +141,8 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 	LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
 	LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
 	controlp = controlp ? controlp->getCOAActive() : NULL;
+	if(!controlp)//Uh oh!
+		return;

 	LLVector3 vector;
 	LLVector3d vectord;