From c486017bf54a4938de8a4b33d1cf26896a3f99fc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 15 Sep 2010 07:52:49 -0700
Subject: Fixed spellcheck comboboxes showing up as blank (do we even want
 comboboxes here?)

---
 linden/indra/newview/llprefsadvanced.cpp | 33 ++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 898ba2c..73a5827 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -239,41 +239,39 @@ void LLPrefsAdvanced::refresh()
 	}
 
 	LLComboBox* comboBox = getChild<LLComboBox>("EmeraldSpellBase");
-	if(comboBox != NULL) 
+	if (comboBox != NULL) 
 	{
 		comboBox->removeall();
 		std::vector<std::string> names = glggHunSpell->getDicts();
-		for(int i=0; i<(int)names.size(); i++) 
+		for (int i = 0; i < (int)names.size(); i++) 
 		{
 			comboBox->add(names[i]);
 		}
 		comboBox->setSimple(gSavedSettings.getString("EmeraldSpellBase"));
 	}
 	comboBox = getChild<LLComboBox>("EmSpell_Avail");
-	if(comboBox != NULL) 
+	if (comboBox != NULL) 
 	{
+		LLSD selected = comboBox->getSelectedValue();
 		comboBox->removeall();
-
-		comboBox->add("");
 		std::vector<std::string> names = glggHunSpell->getAvailDicts();
-		for(int i=0; i<(int)names.size(); i++) 
+		for (int i = 0; i < (int)names.size(); i++) 
 		{
 			comboBox->add(names[i]);
 		}
-		comboBox->setSimple(std::string(""));
+		comboBox->selectByValue(selected);
 	}
 	comboBox = getChild<LLComboBox>("EmSpell_Installed");
-	if(comboBox != NULL) 
+	if (comboBox != NULL) 
 	{
+		LLSD selected = comboBox->getSelectedValue();
 		comboBox->removeall();
-
-		comboBox->add("");
 		std::vector<std::string> names = glggHunSpell->getInstalledDicts();
-		for(int i=0; i<(int)names.size(); i++) 
+		for (int i = 0; i < (int)names.size(); i++) 
 		{
 			comboBox->add(names[i]);
 		}
-		comboBox->setSimple(std::string(""));
+		comboBox->selectByValue(selected);
 	}
 }
 
@@ -311,6 +309,7 @@ void LLPrefsAdvanced::onSpellAdd(void* data)
 	}
 	panel->refresh();
 }
+
 void LLPrefsAdvanced::onSpellRemove(void* data)
 {
 	LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;
@@ -320,23 +319,29 @@ void LLPrefsAdvanced::onSpellRemove(void* data)
 	}
 	panel->refresh();
 }
+
 void LLPrefsAdvanced::onSpellGetMore(void* data)
 {
 	glggHunSpell->getMoreButton(data);
 }
+
 void LLPrefsAdvanced::onSpellEditCustom(void* data)
 {
 	glggHunSpell->editCustomButton();
 }
+
 void LLPrefsAdvanced::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
 {
 
 	LLComboBox* box = (LLComboBox*)ctrl;
-	if(box)
+	if (box)
 	{
 		glggHunSpell->newDictSelection(box->getValue().asString());
 		//LLPanelEmerald* panel = (LLPanelEmerald*)userdata;//box->getParent();
-		if(sInstance)sInstance->refresh();
+		if (sInstance)
+		{
+			sInstance->refresh();
+		}
 	}
 	//LLPanelEmerald* panel = (LLPanelEmerald*)userdata;
 	//if(panel)panel->refresh();
-- 
cgit v1.1