From 32369bbd2728f34f1bcc9fb68a1a191e0b16c827 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Fri, 8 Oct 2010 00:04:15 +0200
Subject: Fix bug #612: Option to highlight misspeld words doesn't persist
 between sessions.

---
 linden/indra/newview/lgghunspell_wrapper.cpp                       | 7 ++-----
 .../newview/skins/default/xui/en-us/panel_preferences_advanced.xml | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/linden/indra/newview/lgghunspell_wrapper.cpp b/linden/indra/newview/lgghunspell_wrapper.cpp
index aa4507c..9548c4f 100644
--- a/linden/indra/newview/lgghunspell_wrapper.cpp
+++ b/linden/indra/newview/lgghunspell_wrapper.cpp
@@ -472,7 +472,7 @@ static char * languageCodesraw[]={
 lggHunSpell_Wrapper::lggHunSpell_Wrapper()
 {
 	//languageCodes(begin(languageCodesraw), end(languageCodesraw));    
-	mSpellCheckHighlight = rebind_llcontrol<BOOL>("EmeraldSpellDisplay", &gSavedSettings, false);
+	mSpellCheckHighlight = rebind_llcontrol<BOOL>("EmeraldSpellDisplay", &gSavedSettings, true);
 }
 
 lggHunSpell_Wrapper::~lggHunSpell_Wrapper()
@@ -963,8 +963,5 @@ void lggHunSpell_Wrapper::editCustomButton()
 
 void lggHunSpell_Wrapper::setSpellCheckHighlight(BOOL highlight)
 {
-	if (mSpellCheckHighlight)
-	{
-		*mSpellCheckHighlight = highlight;
-	}
+	gSavedSettings.setBOOL("EmeraldSpellDisplay", highlight);
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index a0c9e28..c3ee726 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -139,7 +139,7 @@
          name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
          right="490" width="18"/>
       <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-         label="Show misspelled words in red (requires restart)" left="12" mouse_opaque="true" name="EmeraldSpellDisplay"
+         label="Show misspelled words in red" left="12" mouse_opaque="true" name="EmeraldSpellDisplay"
          control_name="EmeraldSpellDisplay" width="126"/>
       <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
          name="EmSpell_txt1" width="512">
-- 
cgit v1.1