Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly

59 files changed, 676 insertions, 593 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index c1d8efa..66ef4c6 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -171,7 +171,8 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
                 mHaveHistory(FALSE),
                 mImage( sImage ),
                 mReplaceNewlinesWithSpaces( TRUE ),
-                mOverRideAndShowMisspellings( FALSE )
+                mSpellCheckable( FALSE ),
+                mShowMisspellings(FALSE)
 {
         llassert( max_length_bytes > 0 );
 
@@ -209,6 +210,13 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
                 sImage = LLUI::getUIImage("sm_rounded_corners_simple.tga");
         }
         mImage = sImage;
+
+        // in other words, highlighting requires a restart
+        if (glggHunSpell->getSpellCheckHighlight())
+        {
+                mShowMisspellings = TRUE;
+        }
+
         // make the popup menu available
         //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_texteditor.xml", parent_view);
         LLMenuGL* menu = new LLMenuGL("wot");
@@ -546,19 +554,19 @@ void LLLineEditor::spell_show(void * data)
         SpellMenuBind* tempBind = (SpellMenuBind*)data;
         LLLineEditor* line = tempBind->origin;
 
-        if(tempBind && line)
+        if( tempBind && line)
         {
-                if(tempBind->word=="Show Misspellings")
+                if (tempBind->word == "Show Misspellings")
                 {
-                        line->setOverRideAndShowMisspellings(TRUE);
-                }else
+                        line->mShowMisspellings = TRUE;
+                }
+                else
                 {
-                        line->setOverRideAndShowMisspellings(FALSE);
+                        line->mShowMisspellings = FALSE;
                 }
         }
-
-
 }
+
 std::vector<S32> LLLineEditor::getMisspelledWordsPositions()
 {
         std::vector<S32> thePosesOfBadWords;
@@ -604,25 +612,29 @@ std::vector<S32> LLLineEditor::getMisspelledWordsPositions()
         }
         return thePosesOfBadWords;
 }
+
 void LLLineEditor::spell_add(void* data)
 {
         SpellMenuBind* tempBind = (SpellMenuBind*)data;
-        if(tempBind)
+        if (tempBind)
         {
                 glggHunSpell->addWordToCustomDictionary(tempBind->word);
                 tempBind->origin->mPrevSpelledText="";//make it update
         }
 }
+
 void LLLineEditor::context_paste(void* data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
         if(line)line->paste();
 }
+
 void LLLineEditor::context_delete(void* data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
         if(line)line->doDelete();
 }
+
 void LLLineEditor::context_selectall(void* data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
@@ -728,16 +740,17 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
         S32 wordStart = 0;
         S32 wordEnd = calculateCursorFromMouse(x);
 
-
         LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
         if (menu)
         {
                 if(menu->isOpen())
+                {
                         menu->setVisible(FALSE);
-                for(int i = 0;i<(int)suggestionMenuItems.size();i++)
+                }
+                for (int i = 0;i<(int)suggestionMenuItems.size();i++)
                 {
                         SpellMenuBind * tempBind = suggestionMenuItems[i];
-                        if(tempBind)
+                        if (tempBind)
                         {
                                 menu->remove((LLMenuItemCallGL *)tempBind->menuItem);
                                 ((LLMenuItemCallGL *)tempBind->menuItem)->die();
@@ -748,69 +761,74 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                 }
                 suggestionMenuItems.clear();
 
-                menu->setItemVisible("Translate To",!mReadOnly);
-                menu->setItemVisible("Transep",!mReadOnly);
+                menu->setItemVisible("Translate To", !mReadOnly);
+                menu->setItemVisible("Transep", !mReadOnly);
 
-                const LLWString& text = mText.getWString();
-                if(( LLTextEditor::isPartOfWord( text[wordEnd] ) ) 
-                        &&(!mReadOnly))
+                // spell_check="true" in xui
+                if (!mReadOnly && mSpellCheckable)
                 {
-                        // Select word the cursor is over
-                        while ((wordEnd > 0) && LLTextEditor::isPartOfWord(text[wordEnd-1]))
-                        {
-                                wordEnd--;
-                        }
-                        wordStart=wordEnd;
-                        //startSelection();
+                        const LLWString& text = mText.getWString();
 
-                        while ((wordEnd < (S32)text.length()) && LLTextEditor::isPartOfWord( text[wordEnd] ) )
+                        // search for word matches
+                        if (LLTextEditor::isPartOfWord(text[wordEnd]))
                         {
-                                wordEnd++;
-                        }               
-                        std::string selectedWord(std::string(text.begin(), 
-                                text.end()).substr(wordStart,wordEnd-wordStart));
-                        if(!glggHunSpell->isSpelledRight(selectedWord))
-                        {       
-                                //misspelled word here, and you have just right clicked on it!
-                                std::vector<std::string> suggs = glggHunSpell->getSuggestionList(selectedWord);
-                                //menu->setItemVisible("Transep",(suggs.size()>0));
+                                // Select word the cursor is over
+                                while ((wordEnd > 0) && LLTextEditor::isPartOfWord(text[wordEnd-1]))
+                                {
+                                        wordEnd--;
+                                }
+                                wordStart = wordEnd;
+                                //startSelection();
 
-                                for(int i = 0;i<(int)suggs.size();i++)
+                                while ((wordEnd < (S32)text.length()) && LLTextEditor::isPartOfWord( text[wordEnd] ) )
                                 {
+                                        wordEnd++;
+                                }               
+                                std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordEnd-wordStart));
+                                
+                                if (!glggHunSpell->isSpelledRight(selectedWord))
+                                {       
+                                        //misspelled word here, and you have just right clicked on it!
+                                        std::vector<std::string> suggs = glggHunSpell->getSuggestionList(selectedWord);
+                                        //menu->setItemVisible("Transep",(suggs.size()>0));
+
+                                        for (int i = 0; i<(int)suggs.size() ;i++)
+                                        {
+                                                SpellMenuBind * tempStruct = new SpellMenuBind;
+                                                tempStruct->origin = this;
+                                                tempStruct->word = suggs[i];
+                                                tempStruct->wordPositionEnd = wordEnd;
+                                                tempStruct->wordPositionStart=wordStart;
+                                                LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
+                                                        tempStruct->word, spell_correct, NULL, tempStruct);
+                                                //new LLMenuItemCallGL("Select All", context_selectall, NULL, this));
+                                                tempStruct->menuItem = suggMenuItem;
+                                                suggestionMenuItems.push_back(tempStruct);
+                                                menu->append(suggMenuItem);
+                                        }
                                         SpellMenuBind * tempStruct = new SpellMenuBind;
                                         tempStruct->origin = this;
-                                        tempStruct->word = suggs[i];
+                                        tempStruct->word = selectedWord;
                                         tempStruct->wordPositionEnd = wordEnd;
                                         tempStruct->wordPositionStart=wordStart;
                                         LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
-                                                tempStruct->word, spell_correct, NULL, tempStruct);
-                                        //new LLMenuItemCallGL("Select All", context_selectall, NULL, this));
+                                                "Add Word", spell_add, NULL, tempStruct);
                                         tempStruct->menuItem = suggMenuItem;
                                         suggestionMenuItems.push_back(tempStruct);
                                         menu->append(suggMenuItem);
                                 }
-                                SpellMenuBind * tempStruct = new SpellMenuBind;
-                                tempStruct->origin = this;
-                                tempStruct->word = selectedWord;
-                                tempStruct->wordPositionEnd = wordEnd;
-                                tempStruct->wordPositionStart=wordStart;
-                                LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
-                                        "Add Word", spell_add, NULL, tempStruct);
-                                tempStruct->menuItem = suggMenuItem;
-                                suggestionMenuItems.push_back(tempStruct);
-                                menu->append(suggMenuItem);
                         }
 
-                }
-                if((!mReadOnly)&&((!glggHunSpell->highlightInRed)
-                        ||(mOverRideAndShowMisspellings)))
-                {
                         SpellMenuBind * tempStruct = new SpellMenuBind;
                         tempStruct->origin = this;
-                        if(mOverRideAndShowMisspellings)
+                        if (mShowMisspellings)
+                        {
                                 tempStruct->word = "Hide Misspellings";
+                        }
                         else
+                        {
                                 tempStruct->word = "Show Misspellings";
+                        }
                         LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
                                 tempStruct->word, spell_show, NULL, tempStruct);
                         tempStruct->menuItem = suggMenuItem;
@@ -1838,36 +1856,43 @@ void LLLineEditor::doDelete()
                 }
         }
 }
+
 void LLLineEditor::autoCorrectText()
 {
         static BOOL *doAnything = rebind_llcontrol<BOOL>("EmeraldEnableAutoCorrect", &gSavedSettings, true);
-        if( (!mReadOnly) && (*doAnything) && (isSpellDirty()))
+        if (!mReadOnly && *doAnything && isSpellDirty())
         {
                 S32 wordStart = 0;
                 S32 wordEnd = mCursorPos-1;
                 //llinfos <<"Checking Word, Cursor is at "<<mCursorPos<<" and text is "<<mText.getString().c_str()<<llendl;
-                if(wordEnd<1)return;
+                if (wordEnd < 1)
+                {
+                        return;
+                }
                 const LLWString& text = mText.getWString();
-                if(text.size()<1)return;
-                if( LLTextEditor::isPartOfWord( text[wordEnd] )) return;//we only check on word breaks
+                if (text.size() < 1 || LLTextEditor::isPartOfWord(text[wordEnd]))
+                {
+                        return;//we only check on word breaks
+                }
+
                 wordEnd--;
-                if( LLTextEditor::isPartOfWord( text[wordEnd] ) )
+                if (LLTextEditor::isPartOfWord(text[wordEnd]))
                 {
                         while ((wordEnd > 0) && (' '!=text[wordEnd-1]))
                         {
                                 wordEnd--;
                         }
-                        wordStart=wordEnd;              
+                        wordStart = wordEnd;            
                         while ((wordEnd < (S32)text.length()) && (' '!=text[wordEnd] ) )
                         {
                                 wordEnd++;
                         }
                         std::string lastTypedWord(std::string(text.begin(), 
-                        text.end()).substr(wordStart,wordEnd-wordStart));
+                        text.end()).substr(wordStart, wordEnd-wordStart));
                         //llinfos << " The last typed word has been chosen, it is "<<lastTypedWord.c_str()<<llendl;
                 
                         std::string correctedWord(LGGAutoCorrect::getInstance()->replaceWord(lastTypedWord));
-                        if(correctedWord!=lastTypedWord)
+                        if(correctedWord != lastTypedWord)
                         {
                                 int dif = correctedWord.length()-lastTypedWord.length();
                                 std::string regText(mText);
@@ -1879,53 +1904,56 @@ void LLLineEditor::autoCorrectText()
                 }
         }
 }
+
 void LLLineEditor::drawMisspelled(LLRect background)
 {
-        if((glggHunSpell->highlightInRed || mOverRideAndShowMisspellings)
-                &&(!mReadOnly))
+        if (!mReadOnly && mSpellCheckable)
         {
-                S32 newStartSpellHere =mScrollHPos;
-                S32 cursorloc =calculateCursorFromMouse(mMaxHPixels);
-                S32 newStopSpellHere = ( ((S32)mText.length())>cursorloc)?cursorloc:(S32)mText.length();
+                S32 newStartSpellHere = mScrollHPos;
+                S32 cursorloc = calculateCursorFromMouse(mMaxHPixels);
+                S32 newStopSpellHere = (((S32)mText.length())>cursorloc) ? cursorloc : (S32)mText.length();
 
                 F32 elapsed = mSpellTimer.getElapsedTimeF32();
-                if(S32(elapsed / 1) & 1) 
+                if (S32(elapsed / 1) & 1) 
                 {
-                        if(isSpellDirty()||(newStartSpellHere!=mStartSpellHere)||(newStopSpellHere!=mEndSpellHere))
+                        if (isSpellDirty() || (newStartSpellHere != mStartSpellHere) || ( newStopSpellHere != mEndSpellHere))
                         {
-                                mStartSpellHere=newStartSpellHere;
-                                mEndSpellHere= newStopSpellHere;
+                                mStartSpellHere = newStartSpellHere;
+                                mEndSpellHere = newStopSpellHere;
                                 resetSpellDirty();
                                 misspellLocations=getMisspelledWordsPositions();
                         }
                 }
-                for(int i =0;i<(int)misspellLocations.size();i++)
-                {
-                        S32 wstart =findPixelNearestPos( misspellLocations[i]-getCursor());
-                        S32 wend = findPixelNearestPos(misspellLocations[++i]-getCursor());
-                        S32 maxw = getRect().getWidth();
 
-                        if(wend > maxw)
-                        {
-                                wend=maxw;
-                        }
-                        if(wstart > maxw)
-                        {
-                                wstart=maxw;
-                        }
-                        gGL.color4ub(255,0,0,200);
-                        //3 line zig zags..
-                        while(wstart<wend)
+                if (mShowMisspellings)
+                {
+                        for (int i =0; i<(int)misspellLocations.size(); i++)
                         {
-                                gl_line_2d(wstart,background.mBottom-1,wstart+3,background.mBottom+2);
-                                gl_line_2d(wstart+3,background.mBottom+2,wstart+6,background.mBottom-1);
-                                wstart+=6;
-                        }
+                                S32 wstart =findPixelNearestPos( misspellLocations[i]-getCursor());
+                                S32 wend = findPixelNearestPos(misspellLocations[++i]-getCursor());
+                                S32 maxw = getRect().getWidth();
 
+                                if (wend > maxw)
+                                {
+                                        wend = maxw;
+                                }
+                                if (wstart > maxw)
+                                {
+                                        wstart = maxw;
+                                }
+                                gGL.color4ub(255,0,0,200);
+                                //3 line zig zags..
+                                while (wstart < wend)
+                                {
+                                        gl_line_2d(wstart, background.mBottom-1, wstart+3, background.mBottom+2);
+                                        gl_line_2d(wstart+3, background.mBottom+2, wstart+6, background.mBottom-1);
+                                        wstart+=6;
+                                }
+                        }
                 }
         }
-
 }
+
 void LLLineEditor::draw()
 {
         autoCorrectText();
@@ -2797,6 +2825,11 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
         {
                 line_editor->setCommitOnFocusLost(commit_on_focus_lost);
         }
+        BOOL spell_checking = FALSE;
+        if (node->getAttributeBOOL("spell_check", spell_checking))
+        {
+                line_editor->setSpellCheckable(spell_checking);
+        }
         
         line_editor->setColorParameters(node);
         
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 6de57ec..147b232 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -198,7 +198,7 @@ public:
         void setWriteableBgColor( const LLColor4& c )   { mWriteableBgColor = c; }
         void setReadOnlyBgColor( const LLColor4& c )    { mReadOnlyBgColor = c; }
         void setFocusBgColor(const LLColor4& c)                 { mFocusBgColor = c; }
-        void setOverRideAndShowMisspellings(BOOL b)             { mOverRideAndShowMisspellings =b;}
+        void setSpellCheckable(BOOL b)                                  { mSpellCheckable = b; }
 
         const LLColor4& getFgColor() const                      { return mFgColor; }
         const LLColor4& getReadOnlyFgColor() const      { return mReadOnlyFgColor; }
@@ -293,7 +293,8 @@ protected:
         std::vector<S32> misspellLocations;     // where all the mispelled words are
         S32                             mStartSpellHere;                // the position of the first char on the screen, stored so we know when to update
         S32                             mEndSpellHere;                  // the location of the last char on the screen
-        BOOL            mOverRideAndShowMisspellings;
+        BOOL                    mSpellCheckable;                // set in xui as "spell_check". Default value for a field
+        BOOL                    mShowMisspellings;              // show misspellings as highlighted (initialized in the ctor)           
         LLFrameTimer mSpellTimer;
         //to keep track of what we have to remove before showing menu
         std::vector<SpellMenuBind* > suggestionMenuItems;
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 6e5cdc4..b101588 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -323,7 +323,8 @@ LLTextEditor::LLTextEditor(
         mLastSelectionY(-1),
         mReflowNeeded(FALSE),
         mScrollNeeded(FALSE),
-        mOverRideAndShowMisspellings(FALSE)
+        mSpellCheckable(FALSE),
+        mShowMisspellings(FALSE)
 {
         mSourceID.generate();
 
@@ -375,6 +376,13 @@ LLTextEditor::LLTextEditor(
 
         mParseHTML=FALSE;
         mHTML.clear();
+
+        // in other words, highlighting requires a restart
+        if (glggHunSpell->getSpellCheckHighlight())
+        {
+                mShowMisspellings = TRUE;
+        }
+
         // make the popup menu available
         //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_texteditor.xml", parent_view);
         LLMenuGL* menu = new LLMenuGL("wot");
@@ -486,14 +494,15 @@ void LLTextEditor::spell_show(void * data)
         SpellMenuBind* tempBind = (SpellMenuBind*)data;
         LLTextEditor* line = tempBind->origin;
 
-        if(tempBind && line)
+        if (tempBind && line)
         {
-                if(tempBind->word=="Show Misspellings")
+                if (tempBind->word == "Show Misspellings")
                 {
-                        line->setOverRideAndShowMisspellings(TRUE);
-                }else
+                        glggHunSpell->setSpellCheckHighlight(TRUE);
+                }
+                else
                 {
-                        line->setOverRideAndShowMisspellings(FALSE);
+                        glggHunSpell->setSpellCheckHighlight(FALSE);
                 }
         }
 }
@@ -1426,7 +1435,6 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 }
 BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
 {
-
         setFocus(TRUE);
 
         //setCursorAtLocalPos( x, y, TRUE );
@@ -1450,69 +1458,73 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                 }
                 suggestionMenuItems.clear();
 
-                menu->setItemVisible("Translate To",!mReadOnly);
-                menu->setItemVisible("Transep",!mReadOnly);
+                menu->setItemVisible("Translate To", !mReadOnly);
+                menu->setItemVisible("Transep", !mReadOnly);
 
-                const LLWString &text = mWText;
-
-                if(( isPartOfWord( text[wordEnd] ) )&&(!mReadOnly))
+                // spell_check="true" in xui
+                if (!mReadOnly && mSpellCheckable)
                 {
-                        // Select word the cursor is over
-                        while ((wordEnd > 0) && isPartOfWord(text[wordEnd-1]))
-                        {
-                                wordEnd--;
-                        }
-                        wordStart=wordEnd;
-                        //startSelection();
-
-                        while ((wordEnd < (S32)text.length()) && isPartOfWord( text[wordEnd] ) )
-                        {
-                                wordEnd++;
-                        }               
-                        std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordEnd-wordStart));
-                        if(!glggHunSpell->isSpelledRight(selectedWord))
+                        const LLWString &text = mWText;
+                        
+                        if (isPartOfWord(text[wordEnd]) && !mReadOnly)
                         {
-                                //misspelled word here, and you have just right clicked on it!
-                                std::vector<std::string> suggs = glggHunSpell->getSuggestionList(selectedWord);
+                                // Select word the cursor is over
+                                while ((wordEnd > 0) && isPartOfWord(text[wordEnd-1]))
+                                {
+                                        wordEnd--;
+                                }
+                                wordStart = wordEnd;
+                                //startSelection();
 
-                                //menu->setItemVisible("Transep",(suggs.size()>0));
-                                for(int i = 0;i<(int)suggs.size();i++)
+                                while ((wordEnd < (S32)text.length()) && isPartOfWord( text[wordEnd] ) )
                                 {
+                                        wordEnd++;
+                                }               
+                                std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordEnd-wordStart));
+                                if (!glggHunSpell->isSpelledRight(selectedWord))
+                                {
+                                        //misspelled word here, and you have just right clicked on it!
+                                        std::vector<std::string> suggs = glggHunSpell->getSuggestionList(selectedWord);
+
+                                        //menu->setItemVisible("Transep",(suggs.size()>0));
+                                        for (int i = 0; i<(int)suggs.size(); i++)
+                                        {
+                                                SpellMenuBind * tempStruct = new SpellMenuBind;
+                                                tempStruct->origin = this;
+                                                tempStruct->word = suggs[i];
+                                                tempStruct->wordPositionEnd = wordEnd;
+                                                tempStruct->wordPositionStart=wordStart;
+                                                tempStruct->wordY=y;
+                                                LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
+                                                        tempStruct->word, spell_correct, NULL, tempStruct);
+                                                tempStruct->menuItem = suggMenuItem;
+                                                suggestionMenuItems.push_back(tempStruct);
+                                                menu->append(suggMenuItem);
+                                        }
                                         SpellMenuBind * tempStruct = new SpellMenuBind;
                                         tempStruct->origin = this;
-                                        tempStruct->word = suggs[i];
+                                        tempStruct->word = selectedWord;
                                         tempStruct->wordPositionEnd = wordEnd;
                                         tempStruct->wordPositionStart=wordStart;
                                         tempStruct->wordY=y;
                                         LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
-                                                tempStruct->word, spell_correct, NULL, tempStruct);
+                                                "Add Word", spell_add, NULL, tempStruct);
                                         tempStruct->menuItem = suggMenuItem;
                                         suggestionMenuItems.push_back(tempStruct);
                                         menu->append(suggMenuItem);
                                 }
-                                SpellMenuBind * tempStruct = new SpellMenuBind;
-                                tempStruct->origin = this;
-                                tempStruct->word = selectedWord;
-                                tempStruct->wordPositionEnd = wordEnd;
-                                tempStruct->wordPositionStart=wordStart;
-                                tempStruct->wordY=y;
-                                LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
-                                        "Add Word", spell_add, NULL, tempStruct);
-                                tempStruct->menuItem = suggMenuItem;
-                                suggestionMenuItems.push_back(tempStruct);
-                                menu->append(suggMenuItem);
                         }
 
-                }
-                if((!mReadOnly)&&((!glggHunSpell->highlightInRed)
-                        ||(mOverRideAndShowMisspellings)||(mShowLineNumbers)))
-                {
                         SpellMenuBind * tempStruct = new SpellMenuBind;
                         tempStruct->origin = this;
-                        if(mOverRideAndShowMisspellings)
+                        if (mShowMisspellings)
+                        {
                                 tempStruct->word = "Hide Misspellings";
+                        }
                         else
+                        {
                                 tempStruct->word = "Show Misspellings";
+                        }
                         LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
                                 tempStruct->word, spell_show, NULL, tempStruct);
                         tempStruct->menuItem = suggMenuItem;
@@ -3077,51 +3089,57 @@ void LLTextEditor::drawSelectionBackground()
                 }
         }
 }
+
 void LLTextEditor::autoCorrectText()
-{
-        
+{       
         static BOOL *doAnything = rebind_llcontrol<BOOL>("EmeraldEnableAutoCorrect", &gSavedSettings, true);
-        if( (!mReadOnly) && (*doAnything) && (isSpellDirty()) )
+        if (!mReadOnly && *doAnything && isSpellDirty())
         {
                 S32 wordStart = 0;
                 S32 wordEnd = mCursorPos-1;
-                if(wordEnd<1)return;
+                if (wordEnd < 1)
+                {
+                        return;
+                }
                 LLWString& text = mWText;
-                if(text.size()<1)return;
-                if( LLTextEditor::isPartOfWord( text[wordEnd] )) return;//we only check on word breaks
+                if (text.size() < 1 || LLTextEditor::isPartOfWord(text[wordEnd]))
+                {
+                        return;//we only check on word breaks
+                }
+
                 wordEnd--;
-                if( LLTextEditor::isPartOfWord( text[wordEnd] ) )
+                if (LLTextEditor::isPartOfWord(text[wordEnd]))
                 {
                         while ((wordEnd > 0) && (text[wordEnd-1]!=' '))
                         {
                                 wordEnd--;
                         }
-                        wordStart=wordEnd;              
+                        wordStart = wordEnd;            
                         while ((wordEnd < (S32)text.length()) && (' '!= text[wordEnd] ) )
                         {
                                 wordEnd++;
                         }
                         std::string lastTypedWord(std::string(text.begin(), 
-                                text.end()).substr(wordStart,wordEnd-wordStart));
+                                text.end()).substr(wordStart, wordEnd-wordStart));
 
-                        std::string regText(text.begin(),text.end());
+                        std::string regText(text.begin(), text.end());
 
                         std::string correctedWord(LGGAutoCorrect::getInstance()->replaceWord(lastTypedWord));
-                        if(correctedWord!=lastTypedWord)
+                        if (correctedWord != lastTypedWord)
                         {
-                                int dif = correctedWord.length()-lastTypedWord.length();
-                                regText.replace(wordStart,lastTypedWord.length(),correctedWord);
-                                mWText=utf8str_to_wstring(regText);
-                                mCursorPos+=dif;
+                                int dif = correctedWord.length() - lastTypedWord.length();
+                                regText.replace(wordStart, lastTypedWord.length(), correctedWord);
+                                mWText = utf8str_to_wstring(regText);
+                                mCursorPos += dif;
                                 needsReflow();
                         }
                 }
         }
 }
+
 void LLTextEditor::drawMisspelled()
 {
-        if(mReadOnly)return;
-        if(glggHunSpell->highlightInRed || mOverRideAndShowMisspellings)
+        if (!mReadOnly && mSpellCheckable)
         {
                 if(
                         ( ((getLength()<400)||(false))  &&(  (S32(mSpellTimer.getElapsedTimeF32() / 1) & 1) ))
@@ -3132,80 +3150,86 @@ void LLTextEditor::drawMisspelled()
                         S32 newSpellStart = getLineStart(mScrollbar->getDocPos());//start at the scroll start
                         S32 newSpellEnd = getLineStart(mScrollbar->getDocPos() + 1 + mScrollbar->getDocSize()-mScrollbar->getDocPosMax());//end at the end o.o
 
-                        if(mScrollbar->getDocPos() == mScrollbar->getDocPosMax())
+                        if (mScrollbar->getDocPos() == mScrollbar->getDocPosMax())
                         {
-                                newSpellEnd=(S32)mWText.length();
+                                newSpellEnd = (S32)mWText.length();
                         }
-                        if((isSpellDirty())||(newSpellEnd!=spellEnd || newSpellStart!=spellStart))
+                        if (isSpellDirty() || (newSpellEnd!=spellEnd || newSpellStart!=spellStart))
                         {
                                 spellEnd = newSpellEnd;
                                 spellStart = newSpellStart;
-                                misspellLocations=getMisspelledWordsPositions();
+                                misspellLocations = getMisspelledWordsPositions();
                         }
                 }
                 //draw
-                for(int i =0;i<(int)misspellLocations.size();i++)
+                if (mShowMisspellings)
                 {
-                        S32 wstart = misspellLocations[i];
-                        S32 wend = misspellLocations[++i];
-                        //start curor code mod
-                        const LLWString &text = mWText;
-                        const S32 text_len = getLength();
-                        // Skip through the lines we aren't drawing.
-                        S32 search_pos = mScrollbar->getDocPos();
-                        S32 num_lines = getLineCount();
-                        if (search_pos >= num_lines)return;
-                        S32 line_start = getLineStart(search_pos);
-                        F32 line_height = mGLFont->getLineHeight();
-                        F32 text_y = (F32)(mTextRect.mTop) - line_height;
-
-                        F32 word_left = 0.f; 
-                        F32 word_right = 0.f;
-                        F32 word_bottom = 0.f;
-                        BOOL word_visible = FALSE;
-
-                        S32 line_end = 0;
-                        // Determine if the cursor is visible and if so what its coordinates are.
-                        while( (mTextRect.mBottom <= llround(text_y)) && (search_pos < num_lines))
+                        for (int i = 0; i<(int)misspellLocations.size() ;i++)
                         {
-                                line_end = text_len + 1;
-                                S32 next_line = -1;
-
-                                if ((search_pos + 1) < num_lines)
+                                S32 wstart = misspellLocations[i];
+                                S32 wend = misspellLocations[++i];
+                                //start curor code mod
+                                const LLWString &text = mWText;
+                                const S32 text_len = getLength();
+                                // Skip through the lines we aren't drawing.
+                                S32 search_pos = mScrollbar->getDocPos();
+                                S32 num_lines = getLineCount();
+                                if (search_pos >= num_lines)
                                 {
-                                        next_line = getLineStart(search_pos + 1);
-                                        line_end = next_line - 1;
+                                        return;
                                 }
-                                const llwchar* line = text.c_str() + line_start;
-                                // Find the cursor and selection bounds
-                                if( line_start <= wstart && wend <= line_end )
+                                S32 line_start = getLineStart(search_pos);
+                                F32 line_height = mGLFont->getLineHeight();
+                                F32 text_y = (F32)(mTextRect.mTop) - line_height;
+
+                                F32 word_left = 0.f; 
+                                F32 word_right = 0.f;
+                                F32 word_bottom = 0.f;
+                                BOOL word_visible = FALSE;
+
+                                S32 line_end = 0;
+                                // Determine if the cursor is visible and if so what its coordinates are.
+                                while( (mTextRect.mBottom <= llround(text_y)) && (search_pos < num_lines))
                                 {
-                                        word_visible = TRUE;
-                                        word_left = (F32)mTextRect.mLeft + mGLFont->getWidthF32(line, 0, wstart - line_start, mAllowEmbeddedItems )-1.f;
-                                        word_right = (F32)mTextRect.mLeft + mGLFont->getWidthF32(line, 0, wend - line_start, mAllowEmbeddedItems )+1.f;
-                                        word_bottom = text_y;
-                                        break;
+                                        line_end = text_len + 1;
+                                        S32 next_line = -1;
+
+                                        if ((search_pos + 1) < num_lines)
+                                        {
+                                                next_line = getLineStart(search_pos + 1);
+                                                line_end = next_line - 1;
+                                        }
+                                        const llwchar* line = text.c_str() + line_start;
+                                        // Find the cursor and selection bounds
+                                        if( line_start <= wstart && wend <= line_end )
+                                        {
+                                                word_visible = TRUE;
+                                                word_left = (F32)mTextRect.mLeft + mGLFont->getWidthF32(line, 0, wstart - line_start, mAllowEmbeddedItems )-1.f;
+                                                word_right = (F32)mTextRect.mLeft + mGLFont->getWidthF32(line, 0, wend - line_start, mAllowEmbeddedItems )+1.f;
+                                                word_bottom = text_y;
+                                                break;
+                                        }
+                                        // move down one line
+                                        text_y -= line_height;
+                                        line_start = next_line;
+                                        search_pos++;
                                 }
-                                // move down one line
-                                text_y -= line_height;
-                                line_start = next_line;
-                                search_pos++;
-                        }
-                        if(mShowLineNumbers)
-                        {
-                                word_left += UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
-                                word_right += UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
-                        }
-                        // Draw the cursor
-                        if( word_visible )
-                        {
-                                //end cursos code mod
-                                gGL.color4ub(255,0,0,200);
-                                while(word_left<word_right)
+                                if (mShowLineNumbers)
+                                {
+                                        word_left += UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
+                                        word_right += UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
+                                }
+                                // Draw the cursor
+                                if (word_visible)
                                 {
-                                        gl_line_2d(word_left,word_bottom-2,word_left+3,word_bottom+1);
-                                        gl_line_2d(word_left+3,word_bottom+1,word_left+6,word_bottom-2);
-                                        word_left+=6;
+                                        //end cursor code mod
+                                        gGL.color4ub(255,0,0,200);
+                                        while (word_left<word_right)
+                                        {
+                                                gl_line_2d(word_left,word_bottom-2, word_left+3,word_bottom+1);
+                                                gl_line_2d(word_left+3,word_bottom+1, word_left+6,word_bottom-2);
+                                                word_left += 6;
+                                        }
                                 }
                         }
                 }
@@ -3214,8 +3238,7 @@ void LLTextEditor::drawMisspelled()
 
 void LLTextEditor::drawCursor()
 {
-        if( gFocusMgr.getKeyboardFocus() == this
-                && gShowTextEditCursor && !mReadOnly)
+        if (!mReadOnly && gFocusMgr.getKeyboardFocus() == this && gShowTextEditCursor)
         {
                 const LLWString &text = mWText;
                 const S32 text_len = getLength();
@@ -3696,10 +3719,7 @@ void LLTextEditor::draw()
                         drawPreeditMarker();
                         drawText();
                         drawCursor();
-                        if(!mShowLineNumbers || mOverRideAndShowMisspellings)
-                        {
-                                drawMisspelled();
-                        }
+                        drawMisspelled();
                         resetSpellDirty();
                         unbindEmbeddedChars(mGLFont);
 
@@ -4879,6 +4899,8 @@ void LLTextEditor::setTextEditorParameters(LLXMLNodePtr node)
 
         node->getAttributeBOOL("track_bottom", mTrackBottom);
 
+        node->getAttributeBOOL("spell_check", mSpellCheckable);
+
         LLColor4 color;
         if (LLUICtrlFactory::getAttributeColor(node,"cursor_color", color)) 
         {
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 6b372d7..57a6bbd 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -229,7 +229,7 @@ public:
         void                    setThumbColor( const LLColor4& color );
         void                    setHighlightColor( const LLColor4& color );
         void                    setShadowColor( const LLColor4& color );
-        void                    setOverRideAndShowMisspellings(BOOL b){ mOverRideAndShowMisspellings =b;}
+        void                    setSpellCheckable(BOOL b)                                       { mSpellCheckable = b; }
 
         // Hacky methods to make it into a word-wrapping, potentially scrolling,
         // read-only text box.
@@ -526,7 +526,8 @@ private:
         S32 spellStart;
         S32 spellEnd;
         std::vector<S32> misspellLocations;     // where all the mispelled words are
-        BOOL            mOverRideAndShowMisspellings;
+        BOOL                    mSpellCheckable;                        // set in xui as "spell_check". Default value for a field
+        BOOL                    mShowMisspellings;              // show misspellings as highlighted (initialized in the ctor)
         
         S32                             mMaxTextByteLength;             // Maximum length mText is allowed to be in bytes
 
diff --git a/linden/indra/newview/app_settings/dictionaries/en_sl.dic b/linden/indra/newview/app_settings/dictionaries/en_sl.dic
index c5de03f..f37b60d 100644
--- a/linden/indra/newview/app_settings/dictionaries/en_sl.dic
+++ b/linden/indra/newview/app_settings/dictionaries/en_sl.dic
@@ -1719,6 +1719,8 @@ login
 logins
 logout
 lscript
+lsl
+lsl2
 mac_crash_logger
 mac_updater
 mapto
diff --git a/linden/indra/newview/lggdicdownload.cpp b/linden/indra/newview/lggdicdownload.cpp
index 5b8b13a..8cd9795 100644
--- a/linden/indra/newview/lggdicdownload.cpp
+++ b/linden/indra/newview/lggdicdownload.cpp
@@ -49,10 +49,11 @@
 #include "llbufferstream.h"
 
 class lggDicDownloadFloater;
+
 class EmeraldDicDownloader : public LLHTTPClient::Responder
 {
 public:
-        EmeraldDicDownloader(lggDicDownloadFloater * spanel,std::string sname);
+        EmeraldDicDownloader(lggDicDownloadFloater* spanel, std::string sname);
         ~EmeraldDicDownloader() { }
         void completedRaw(
                 U32 status,
@@ -77,9 +78,11 @@ public:
         std::vector<std::string> lNames;
         LLPrefsAdvanced * empanel;
 };
+
 lggDicDownloadFloater::~lggDicDownloadFloater()
 {
 }
+
 lggDicDownloadFloater::lggDicDownloadFloater(const LLSD& seed)
 {
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_dictionaries.xml");
@@ -89,96 +92,96 @@ lggDicDownloadFloater::lggDicDownloadFloater(const LLSD& seed)
         {
                 center();
         }
-
 }
 
 BOOL lggDicDownloadFloater::postBuild(void)
 {
-        childSetAction("Emerald_dic_download",onClickDownload,this);
+        childSetAction("Emerald_dic_download", onClickDownload, this);
         return true;
 }
-void lggDicDownloadFloater::setData(std::vector<std::string> shortNames, std::vector<std::string> longNames, void * data)
+
+void lggDicDownloadFloater::setData(std::vector<std::string> shortNames, std::vector<std::string> longNames, void* data)
 {
-        sNames=shortNames;
-        lNames=longNames;
+        sNames = shortNames;
+        lNames = longNames;
         empanel = (LLPrefsAdvanced*)data;
 
         LLComboBox* comboBox = getChild<LLComboBox>("Emerald_combo_dics");
-        if(comboBox != NULL) 
+        if (comboBox != NULL) 
         {
                 comboBox->removeall();
-                comboBox->add("");
-                for(int i = 0; i < (int)lNames.size(); i++)
+                for (int i = 0; i < (int)lNames.size(); i++)
                 {
-                        comboBox->add(lNames[i]);
+                        comboBox->add(lNames[i], ADD_BOTTOM);
                 }
                 comboBox->setCurrentByIndex(0);
+                comboBox->add("", ADD_BOTTOM);
         }
 }
+
 void lggDicDownloadFloater::onClickDownload(void* data)
 {
         lggDicDownloadFloater* self = (lggDicDownloadFloater*)data;
-        if(self)
+        if (self)
         {
                 //std::string selection = self->childGetValue("Emerald_combo_dics").asString();
                 LLComboBox* comboBox = self->getChild<LLComboBox>("Emerald_combo_dics");
-                if(comboBox != NULL) 
+                if (comboBox != NULL) 
                 {
-                        int index = comboBox->getCurrentIndex();
-                        if(index!=0)
+                        if (!comboBox->getSelectedItemLabel().empty())
                         {
-                                index--;
-                                std::string newDict(self->sNames[index]);
+                                std::string newDict(self->sNames[comboBox->getCurrentIndex()]);
                                 LLHTTPClient::get(gSavedSettings.getString("DicDownloadBaseURL")+newDict+".aff", new EmeraldDicDownloader(self,newDict+".aff"));
                                 LLHTTPClient::get(gSavedSettings.getString("DicDownloadBaseURL")+newDict+".dic", new EmeraldDicDownloader(NULL,newDict+".dic"));
                                 
-                                LLButton* butt = self->getChild<LLButton>("Emerald_dic_download");
-                                if(butt)
+                                LLButton* button = self->getChild<LLButton>("Emerald_dic_download");
+                                if (button)
                                 {
-                                        butt->setLabel(LLStringExplicit("Downloading... Please Wait"));
-                                        butt->setEnabled(FALSE);
+                                        // TODO: move this to xml
+                                        button->setLabel(LLStringExplicit("Downloading... Please Wait"));
+                                        button->setEnabled(FALSE);
                                 }
-
                         }
                 }
-        }
-        
- 
+        } 
 }
 
 void LggDicDownload::show(BOOL showin, std::vector<std::string> shortNames, std::vector<std::string> longNames, void * data)
 {
-        if(showin)
+        if (showin)
         {
                 lggDicDownloadFloater* dic_floater = lggDicDownloadFloater::showInstance();
                 dic_floater->setData(shortNames,longNames,data);
         }
 }
-EmeraldDicDownloader::EmeraldDicDownloader(lggDicDownloadFloater* spanel, std::string sname):
-panel(spanel),name(sname){}
+
+EmeraldDicDownloader::EmeraldDicDownloader(lggDicDownloadFloater* spanel, std::string sname)
+        :
+        panel(spanel),
+        name(sname)
+{
+}
 
 
 void EmeraldDicDownloader::completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels, const LLIOPipe::buffer_ptr_t& buffer)
 {
-        if(status < 200 || status >= 300)
+        if (status < 200 || status >= 300)
         {
                 return;
         }
         LLBufferStream istr(channels, buffer.get());
-        std::string dicpath(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", 
-                name.c_str()));
-        
-        
+        std::string dicpath(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", name.c_str()));
+
         llofstream ostr(dicpath, std::ios::binary);
 
-        while(istr.good() && ostr.good())
+        while (istr.good() && ostr.good())
+        {
                 ostr << istr.rdbuf();
+        }
         ostr.close();
-        if(panel)
+        if (panel)
         {
                 panel->empanel->refresh();
                 panel->close();
         }
-        
-        
 }
diff --git a/linden/indra/newview/lgghunspell_wrapper.cpp b/linden/indra/newview/lgghunspell_wrapper.cpp
index 5879bac..f800043 100644
--- a/linden/indra/newview/lgghunspell_wrapper.cpp
+++ b/linden/indra/newview/lgghunspell_wrapper.cpp
@@ -468,53 +468,64 @@ static char * languageCodesraw[]={
 };
 //#define LANGUAGE_CODES_RAW_SIZE ((__LINE__ - 1 - LANGUAGE_CODES_RAW_START_LINE) * 2)
 #define LANGUAGE_CODES_RAW_SIZE 368
+
 lggHunSpell_Wrapper::lggHunSpell_Wrapper()
+        :
+        mSpellCheckHighlight(false)
 {
-        highlightInRed=false;
         //languageCodes(begin(languageCodesraw), end(languageCodesraw));    
 }
-lggHunSpell_Wrapper::~lggHunSpell_Wrapper(){}
+
+lggHunSpell_Wrapper::~lggHunSpell_Wrapper()
+{
+}
+
 std::string lggHunSpell_Wrapper::getCorrectPath(std::string file)
 {
         //finds out if it is in user dir, if not, takes it from app dir
         std::string dicpath1(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", file).c_str());
-        if(!gDirUtilp->fileExists(dicpath1))
+        if (!gDirUtilp->fileExists(dicpath1))
+        {
                 dicpath1=gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "dictionaries", file).c_str();
-
+        }
         return dicpath1;
 }
+
 void lggHunSpell_Wrapper::setNewDictionary(std::string newDict)
 {
 
         llinfos << "Setting new base dictionary long name is-> " << newDict.c_str() << llendl;
 
-        currentBaseDic=newDict;
+        currentBaseDic = newDict;
         
         //expecting a full name comming in
         newDict = fullName2DictName(newDict);
 
-        if(myHunspell)delete myHunspell;
+        if (myHunspell)
+        {
+                delete myHunspell;
+        }
 
-        std::string dicaffpath=getCorrectPath(newDict+".aff");
-        std::string dicdicpath=getCorrectPath(newDict+".dic");
+        std::string dicaffpath = getCorrectPath(newDict+".aff");
+        std::string dicdicpath = getCorrectPath(newDict+".dic");
         
         llinfos << "Setting new base dictionary -> " << dicaffpath.c_str() << llendl;
 
-        myHunspell = new Hunspell(dicaffpath.c_str(),dicdicpath.c_str());
+        myHunspell = new Hunspell(dicaffpath.c_str(), dicdicpath.c_str());
         llinfos << "Adding custom dictionary " << llendl;
         createCustomDic();
         addDictionary("custom");
         std::vector<std::string> toInstall = getInstalledDicts();
-        for(int i =0;i<(int)toInstall.size();i++)
+        for (int i = 0; i < (int)toInstall.size(); i++)
+        {
                 addDictionary(toInstall[i]);
-
-
+        }
 }
+
 void lggHunSpell_Wrapper::createCustomDic()
 {
-        std::string filename(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
-                "dictionaries", "custom.dic"));
-        if(!gDirUtilp->fileExists(filename))
+        std::string filename(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", "custom.dic"));
+        if (!gDirUtilp->fileExists(filename))
         {
                 llofstream export_file; 
                 export_file.open(filename);
@@ -523,49 +534,67 @@ void lggHunSpell_Wrapper::createCustomDic()
                 export_file.close();
         }
 }
+
 void lggHunSpell_Wrapper::addWordToCustomDictionary(std::string wordToAdd)
 {
-        if(!myHunspell)return;
+        if (!myHunspell)
+        {
+                return;
+        }
+
         myHunspell->add(wordToAdd.c_str());
         std::string filename(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", "custom.dic"));
         std::vector<std::string> lines;
-        if(gDirUtilp->fileExists(filename))
+        if (gDirUtilp->fileExists(filename))
         {
                 //get words already there..
                 llifstream importer(filename);
                 std::string line;
-                if(getline( importer, line ))//ignored the size
+                if (getline( importer, line ))//ignored the size
                 {
-                        while( getline( importer, line ) ) lines.push_back(line);
+                        while ( getline( importer, line ) ) lines.push_back(line);
                 }
                 importer.close();
         }
+
         llofstream export_file; 
         export_file.open(filename);
-        std::string sizePart(llformat("%i",(int)(lines.size()+1))+"\n");
-        export_file.write(sizePart.c_str(),sizePart.length());
-        for(int i=0;i<(int)lines.size();i++)
+        std::string sizePart(llformat("%i", (int)(lines.size()+1)) + "\n");
+        export_file.write(sizePart.c_str(), sizePart.length());
+        for (int i = 0; i < (int)lines.size() ;i++)
+        {
                 export_file.write(std::string(lines[i]+"\n").c_str(),lines[i].length()+1);
+        }
         //LLStringUtil::toLower(wordToAdd);
-        wordToAdd=wordToAdd+std::string("\n");
-        export_file.write(wordToAdd.c_str(),wordToAdd.length());
+        wordToAdd = wordToAdd+std::string("\n");
+        export_file.write(wordToAdd.c_str(), wordToAdd.length());
         //export_file << std::hex << 10 ;
         export_file.close();
 }
+
 BOOL lggHunSpell_Wrapper::isSpelledRight(std::string wordToCheck)
 {
-        if(!myHunspell)return TRUE;
-        if(wordToCheck.length()<3)return TRUE;
+        if (!myHunspell || wordToCheck.length() < 3)
+        {
+                return TRUE;
+        }
         return myHunspell->spell(wordToCheck.c_str());
 }
+
 std::vector<std::string> lggHunSpell_Wrapper::getSuggestionList(std::string badWord)
 {
         std::vector<std::string> toReturn;
-        if(!myHunspell)return toReturn;
-        char ** suggestionList; 
+        if (!myHunspell)
+        {
+                return toReturn;
+        }
+
+        char** suggestionList;  
         int numberOfSuggestions = myHunspell->suggest(&suggestionList, badWord.c_str());        
-        if(numberOfSuggestions <= 0)
-                return toReturn;        
+        if (numberOfSuggestions <= 0)
+        {
+                return toReturn;
+        }
         for (int i = 0; i < numberOfSuggestions; i++) 
         {
                 std::string tempSugg(suggestionList[i]);
@@ -574,14 +603,16 @@ std::vector<std::string> lggHunSpell_Wrapper::getSuggestionList(std::string badW
         myHunspell->free_list(&suggestionList,numberOfSuggestions);     
         return toReturn;
 }
+
 void lggHunSpell_Wrapper::debugTest(std::string testWord)
 {
         llinfos << "Testing to see if " << testWord.c_str() << " is spelled correct" << llendl;
 
-        if( isSpelledRight(testWord))
+        if (isSpelledRight(testWord))
         {
                 llinfos << testWord.c_str() << " is spelled correctly" << llendl;
-        }else
+        }
+        else
         {
                 llinfos << testWord.c_str() << " is not spelled correctly, getting suggestions" << llendl;
                 std::vector<std::string> suggList;
@@ -589,148 +620,167 @@ void lggHunSpell_Wrapper::debugTest(std::string testWord)
                 suggList = getSuggestionList(testWord);
                 llinfos << "Got suggestions.. " << llendl;
 
-                for(int i = 0; i<(int)suggList.size();i++)
+                for (int i = 0; i < (int)suggList.size(); i++)
                 {
                         llinfos << "Suggestion for " << testWord.c_str() << ":" << suggList[i].c_str() << llendl;
                 }
-
         }
-
 }
+
 void lggHunSpell_Wrapper::initSettings()
 {
         glggHunSpell = new lggHunSpell_Wrapper();
         glggHunSpell->processSettings();
 }
+
 void lggHunSpell_Wrapper::processSettings()
 {
         //expects everything to already be in saved settings
         //this will also reload and read the installed dicts
         setNewDictionary(gSavedSettings.getString("EmeraldSpellBase"));
-        highlightInRed= gSavedSettings.getBOOL("EmeraldSpellDisplay");
+        mSpellCheckHighlight = gSavedSettings.getBOOL("EmeraldSpellDisplay");
         
 }
+
 void lggHunSpell_Wrapper::addDictionary(std::string additionalDictionary)
 {
-        if(!myHunspell)return;
-        if(additionalDictionary=="")return;
+        if (!myHunspell || additionalDictionary.empty())
+        {
+                return;
+        }
+
         //expecting a full name here
-        std::string dicpath=getCorrectPath(fullName2DictName(additionalDictionary)+".dic");
-        if(gDirUtilp->fileExists(dicpath))
+        std::string dicpath = getCorrectPath(fullName2DictName(additionalDictionary)+".dic");
+        if (gDirUtilp->fileExists(dicpath))
         {
                 llinfos << "Adding additional dictionary -> " << dicpath.c_str() << llendl;
                 myHunspell->add_dic(dicpath.c_str());
         }
 }
+
 std::string lggHunSpell_Wrapper::dictName2FullName(std::string dictName)
 {
-        if(dictName==std::string(""))return std::string("");
-        std::string countryCode="";
-        std::string languageCode="";
+        if (dictName.empty())
+        {
+                return dictName;
+        }
+
+        std::string countryCode("");
+        std::string languageCode("");
+
         //remove extension
         dictName = dictName.substr(0,dictName.find("."));
+
         //break it up by - or _
         S32 breakPoint = dictName.find("-");
-        if(breakPoint==std::string::npos)
+        if (breakPoint == std::string::npos)
+        {
                 breakPoint = dictName.find("_");
-        if(breakPoint==std::string::npos)
+        }
+        if (breakPoint == std::string::npos)
         {
                 //no country code given
-                languageCode=dictName;
-        }else
+                languageCode = dictName;
+        }
+        else
         {
-                languageCode=dictName.substr(0,breakPoint);
-                countryCode=dictName.substr(breakPoint+1);
+                languageCode = dictName.substr(0,breakPoint);
+                countryCode = dictName.substr(breakPoint+1);
         }
+
         //get long language code
-        for(int i =0;i<LANGUAGE_CODES_RAW_SIZE;i++)
+        for (int i = 0; i<LANGUAGE_CODES_RAW_SIZE; i++)
         {               
-                if(0==LLStringUtil::compareInsensitive(languageCode,std::string(languageCodesraw[i])))
+                if (0 == LLStringUtil::compareInsensitive(languageCode, std::string(languageCodesraw[i])))
                 {
-                        languageCode=languageCodesraw[i+1];
+                        languageCode = languageCodesraw[i+1];
                         break;
                 }
         }
+
         //get long country code
-        if(countryCode!="")
+        if (!countryCode.empty())
         {
-                for(int i =0;i<COUNTRY_CODES_RAW_SIZE;i++)
+                for (int i =0; i<COUNTRY_CODES_RAW_SIZE; i++)
                 {               
                         //llinfos << i << llendl;
-                        if(0==LLStringUtil::compareInsensitive(countryCode,std::string(countryCodesraw[i])))
+                        if (0 == LLStringUtil::compareInsensitive(countryCode, std::string(countryCodesraw[i])))
                         {
-                                countryCode=countryCodesraw[i+1];
+                                countryCode = countryCodesraw[i+1];
                                 break;
                         }
                 }
-                countryCode=" ("+countryCode+")";
+                countryCode = " (" + countryCode + ")";
         }
         
         return std::string(languageCode+countryCode);
 }
+
 std::string lggHunSpell_Wrapper::fullName2DictName(std::string fullName)
 {
         std::string countryCode("");
         std::string languageCode("");
         S32 breakPoint = fullName.find(" (");
-        if(breakPoint==std::string::npos)
+        if (breakPoint == std::string::npos)
         {
-                languageCode=fullName;
-        }else
+                languageCode = fullName;
+        }
+        else
         {
-                languageCode=fullName.substr(0,breakPoint);
-                countryCode=fullName.substr(breakPoint+2,fullName.length()-3-breakPoint);
+                languageCode = fullName.substr(0, breakPoint);
+                countryCode = fullName.substr(breakPoint+2, fullName.length()-3-breakPoint);
         }
         //get long language code
-        for(int i =1;i<LANGUAGE_CODES_RAW_SIZE;i+=2)
+        for (int i = 1; i<LANGUAGE_CODES_RAW_SIZE; i+=2)
         {
                 //llinfos << i << llendl;
-                if(0==LLStringUtil::compareInsensitive(languageCode,std::string(languageCodesraw[i])))
+                if (0 == LLStringUtil::compareInsensitive(languageCode, std::string(languageCodesraw[i])))
                 {
-                        languageCode=std::string(languageCodesraw[i-1]);
+                        languageCode = std::string(languageCodesraw[i-1]);
                         break;
                 }
         }
         //get long country code
-        if(countryCode!="")
-                for(int i =1;i<COUNTRY_CODES_RAW_SIZE;i+=2)
+        std::string toReturn = languageCode;
+        if (!countryCode.empty())
+        {
+                for (int i = 1; i<COUNTRY_CODES_RAW_SIZE; i+=2)
                 {
                         //llinfos << i << " comparing " <<countryCode<<" and "<<std::string(countryCodesraw[i]).c_str()<< llendl;
-                        if(0==LLStringUtil::compareInsensitive(countryCode,std::string(countryCodesraw[i])))
+                        if (0 == LLStringUtil::compareInsensitive(countryCode, std::string(countryCodesraw[i])))
                         {
-                                countryCode=std::string(countryCodesraw[i-1]);
+                                countryCode = std::string(countryCodesraw[i-1]);
                                 break;
                         }
                 }
-                std::string toReturn = languageCode;
-                if(countryCode!="")
-                {
-                        toReturn+="_"+countryCode;
-                }
-                LLStringUtil::toLower(toReturn);
-                return toReturn;
+                toReturn += "_" + countryCode;
+        }
+
+        LLStringUtil::toLower(toReturn);
+        return toReturn;
 }
+
 std::vector <std::string> lggHunSpell_Wrapper::getDicts()
 {
         std::vector<std::string> names; 
         std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "dictionaries", ""));
         bool found = true;                      
-        while(found) 
+        while (found) 
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name, "*.aff", name, false);
-                if(found)
+                if (found)
                 {
                         names.push_back(dictName2FullName(name));
                 }
         }
-        path_name=gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", "");
-        found=true;
-        while(found) 
+        path_name = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", "");
+        found = true;
+        while (found) 
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name, "*.aff", name, false);
-                if(found)
+                if (found)
                 {
                         names.push_back(dictName2FullName(name));
                 }
@@ -738,123 +788,159 @@ std::vector <std::string> lggHunSpell_Wrapper::getDicts()
 
         return names;
 }
+
 std::vector <std::string> lggHunSpell_Wrapper::getExtraDicts()
 {
         std::vector<std::string> names; 
         std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "dictionaries", ""));
         bool found = true;                      
-        while(found) 
+        while (found) 
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name, "*.dic", name, false);
-                if(found)
+                if (found)
                 {
                         names.push_back(dictName2FullName(name));
                 }
         }
-        path_name=gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", "");
-        found=true;
-        while(found) 
+        path_name = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", "");
+        found = true;
+        while (found) 
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name, "*.dic", name, false);
-                if(found)
+                if (found)
                 {
                         names.push_back(dictName2FullName(name));
                 }
         }
         return names;
 }
+
 std::vector<std::string> lggHunSpell_Wrapper::getInstalledDicts()
 {
         std::vector<std::string> toReturn;
         //expecting short names to be stored...
-        std::vector<std::string> shortNames =  CSV2VEC(gSavedSettings.getString("EmeraldSpellInstalled"));
-        for(int i =0;i<(int)shortNames.size();i++)
+        std::vector<std::string> shortNames = CSV2VEC(gSavedSettings.getString("EmeraldSpellInstalled"));
+        for (int i =0; i < (int)shortNames.size(); i++)
+        {
                 toReturn.push_back(dictName2FullName(shortNames[i]));
+        }
         return toReturn;
 }
+
 std::vector<std::string> lggHunSpell_Wrapper::getAvailDicts()
 {
         std::vector<std::string> toReturn;
         std::vector<std::string> dics = getExtraDicts();
         std::vector<std::string> installedDics = getInstalledDicts();
-        for(int i =0;i<(int)dics.size();i++)
+        for (int i = 0; i < (int)dics.size(); i++)
         {
                 bool found = false;
-                for(int j=0;j<(int)installedDics.size();j++)
+                for (int j = 0; j < (int)installedDics.size(); j++)
+                {
+                        if (0 == LLStringUtil::compareInsensitive(dics[i], installedDics[j]))
+                        {
+                                found = true;//this dic is already installed
+                        }
+                }
+                if (0 == LLStringUtil::compareInsensitive(dics[i], currentBaseDic))
                 {
-                        if(0==LLStringUtil::compareInsensitive(dics[i],installedDics[j]))
-                                found=true;//this dic is already installed
+                        found = true;
+                }
+                if (0 == LLStringUtil::compareInsensitive(dics[i], "Emerald (CUSTOM)"))
+                {
+                        found = true;
+                }
+                if (!found)
+                {
+                        toReturn.push_back(dics[i]);
                 }
-                if(0==LLStringUtil::compareInsensitive(dics[i],currentBaseDic))
-                        found=true;
-                if(0==LLStringUtil::compareInsensitive(dics[i],"Emerald (CUSTOM)"))
-                        found=true;
-                if(!found)toReturn.push_back(dics[i]);
         }
         return toReturn;
 }
+
 std::vector<std::string> lggHunSpell_Wrapper::CSV2VEC(std::string csv)
 {
         std::vector<std::string> toReturn;
         boost::regex re(",");
         boost::sregex_token_iterator i(csv.begin(), csv.end(), re, -1);
         boost::sregex_token_iterator j;
-        while(i != j)
+        while (i != j)
+        {
                 toReturn.push_back(*i++);
+        }
         return toReturn;
 }
+
 std::string lggHunSpell_Wrapper::VEC2CSV(std::vector<std::string> vec)
 {
-        std::string toReturn="";
-        if(vec.size()<1)return toReturn;
-        for(int i = 0;i<(int)vec.size();i++)
-                toReturn+=vec[i]+",";
+        std::string toReturn("");
+        if (vec.size() < 1)
+        {
+                return toReturn;
+        }
+
+        for (int i = 0;i < (int)vec.size() ;i++)
+        {
+                toReturn += vec[i] + ",";
+        }
         return toReturn.erase(toReturn.length()-1);
 }
+
 void lggHunSpell_Wrapper::addButton(std::string selection)
 {
-        if(selection=="")return;
+        if (selection.empty())
+        {
+                return;
+        }
         addDictionary(selection);
         std::vector<std::string> alreadyInstalled = CSV2VEC(gSavedSettings.getString("EmeraldSpellInstalled"));
         alreadyInstalled.push_back(fullName2DictName(selection));       
-        gSavedSettings.setString("EmeraldSpellInstalled",VEC2CSV(alreadyInstalled));
+        gSavedSettings.setString("EmeraldSpellInstalled", VEC2CSV(alreadyInstalled));
 }
+
 void lggHunSpell_Wrapper::removeButton(std::string selection)
 {
-        if(selection=="")return;
+        if (selection.empty())
+        {
+                return;
+        }
         std::vector<std::string> newInstalledDics;
         std::vector<std::string> currentlyInstalled = getInstalledDicts();
-        for(int i =0;i<(int)currentlyInstalled.size();i++)
+        for (int i = 0; i < (int)currentlyInstalled.size(); i++)
         {
-                if(0!=LLStringUtil::compareInsensitive(selection,currentlyInstalled[i]))
+                if (0 != LLStringUtil::compareInsensitive(selection, currentlyInstalled[i]))
+                {
                         newInstalledDics.push_back(fullName2DictName(currentlyInstalled[i]));
+                }
         }
-        gSavedSettings.setString("EmeraldSpellInstalled",VEC2CSV(newInstalledDics));
+        gSavedSettings.setString("EmeraldSpellInstalled", VEC2CSV(newInstalledDics));
         processSettings();
 }
+
 void lggHunSpell_Wrapper::newDictSelection(std::string selection)
 {
-        currentBaseDic=selection;
-        gSavedSettings.setString("EmeraldSpellBase",selection);
+        currentBaseDic = selection;
+        gSavedSettings.setString("EmeraldSpellBase", selection);
         //better way to do this would be to check and see if there is a installed conflict
         //and then only remove that one.. messy
-        gSavedSettings.setString("EmeraldSpellInstalled","en_sl");
+        gSavedSettings.setString("EmeraldSpellInstalled", "en_sl");
         processSettings();
 }
-void lggHunSpell_Wrapper::getMoreButton(void * data)
+
+void lggHunSpell_Wrapper::getMoreButton(void* data)
 {
         std::vector<std::string> shortNames;
         std::vector<std::string> longNames;
         LLSD response = LLHTTPClient::blockingGet(gSavedSettings.getString("DicDownloadBaseURL")+"dic_list.xml");
-        if(response.has("body"))
+        if (response.has("body"))
         {
                 const LLSD &dict_list = response["body"];
-                if(dict_list.has("isComplete"))
+                if (dict_list.has("isComplete"))
                 {
                         LLSD dics = dict_list["data"];
-                        for(int i = 0; i < dics.size(); i++)
+                        for (int i = 0; i < dics.size(); i++)
                         {
                                 std::string dicFullName = dictName2FullName(dics[i].asString());
                                 longNames.push_back(dicFullName);
@@ -864,11 +950,12 @@ void lggHunSpell_Wrapper::getMoreButton(void * data)
                 }
         }
 }
+
 void lggHunSpell_Wrapper::editCustomButton()
 {
         std::string dicdicpath(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", std::string("custom.dic")).c_str());
 
-        if(!gDirUtilp->fileExists(dicdicpath))
+        if (!gDirUtilp->fileExists(dicdicpath))
         {
                         createCustomDic();
                         //glggHunSpell->addWordToCustomDictionary("temp");
@@ -877,7 +964,7 @@ void lggHunSpell_Wrapper::editCustomButton()
         gViewerWindow->getWindow()->ShellEx(dicdicpath);
 }
 
-void lggHunSpell_Wrapper::setNewHighlightSetting( BOOL highlight )
+void lggHunSpell_Wrapper::setSpellCheckHighlight(BOOL highlight)
 {
-        highlightInRed=highlight;
+        mSpellCheckHighlight = highlight;
 }
diff --git a/linden/indra/newview/lgghunspell_wrapper.h b/linden/indra/newview/lgghunspell_wrapper.h
index 348f479..b5f3ddb 100644
--- a/linden/indra/newview/lgghunspell_wrapper.h
+++ b/linden/indra/newview/lgghunspell_wrapper.h
@@ -28,9 +28,7 @@ class lggHunSpell_Wrapper
 {
 
 public:
-        static Hunspell * myHunspell;
-
-        BOOL highlightInRed;
+        static Hunspell* myHunspell;
 
         static void initSettings();
         void processSettings();
@@ -49,7 +47,6 @@ public:
         static std::string dictName2FullName(std::string dictName);
         static std::string fullName2DictName(std::string fullName);
         void setNewDictionary(std::string newDict);
-        void setNewHighlightSetting(BOOL highlight);
         BOOL isSpelledRight(std::string wordToCheck);
         std::vector<std::string> getSuggestionList(std::string badWord);
         S32 findNextError(std::string haystack, int startAt);
@@ -57,6 +54,9 @@ public:
         std::vector<std::string> CSV2VEC(std::string csv);
         std::string VEC2CSV(std::vector<std::string> vec);
 
+        void setSpellCheckHighlight(BOOL highlight);
+        BOOL getSpellCheckHighlight() { return mSpellCheckHighlight; }
+
 private:
         void createCustomDic();
         std::string getCorrectPath(std::string file);
@@ -67,8 +67,9 @@ private:
         std::string currentBaseDic;
         //std::vector<std::string> languageCodes;
         //std::vector<std::string> countryCodes;
+        BOOL mSpellCheckHighlight;
 };
 
-extern lggHunSpell_Wrapper *glggHunSpell; // the singleton hunspell wrapper
+extern lggHunSpell_Wrapper* glggHunSpell; // the singleton hunspell wrapper
 
 #endif 
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index ed0b432..cb0416e 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -256,41 +256,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);
         }
 }
 
@@ -328,6 +326,7 @@ void LLPrefsAdvanced::onSpellAdd(void* data)
         }
         panel->refresh();
 }
+
 void LLPrefsAdvanced::onSpellRemove(void* data)
 {
         LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;
@@ -337,23 +336,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();
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 966dc2d..9bc91e7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -32,7 +32,7 @@
                              font="SansSerifSmall" handle_edit_keys_directly="false" height="52"
                              left="96" max_length="255" mouse_opaque="true" name="Description"
                              select_all_on_focus_received="false" select_on_focus="false"
-                             width="350" word_wrap="true" />
+                             width="350" word_wrap="true" spell_check="true" />
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
@@ -292,7 +292,7 @@ Go to World menu > About Land or select another parcel to show its details.
                         <text_editor type="string" length="1" bottom="-175" embedded_items="false" enabled="false"
                              follows="left|top|right|bottom" font="SansSerifSmall" height="115"
                              left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
-                             width="330" word_wrap="true">
+                             width="330" word_wrap="true" spell_check="true">
                                 There is no Covenant provided for this Estate.
                         </text_editor>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -832,7 +832,7 @@ Only large parcels can be listed in search.
                              follows="left|top" font="SansSerifSmall" height="16" left="80"
                              max_length="255" name="url_description" right="-80"
                              select_all_on_focus_received="true" select_on_focus="true"
-                             tool_tip="Text displayed next to play/load button" />
+                             tool_tip="Text displayed next to play/load button" spell_check="true" />
                         <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
                              height="16" left="10" name="Media texture:" width="364">
                                 Replace
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index f2c5d34..80a0468 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -13,7 +13,7 @@
                 Description:
         </text>
         <line_editor bottom_delta="-2" follows="top|left|right" height="19" left="85"
-             max_length="254" name="description_form" right="-10" />
+             max_length="254" name="description_form" right="-10" spell_check="true" />
         <pad height="0" />
         <spinner decimal_digits="0" follows="left|top" height="18" increment="1" initial_val="0"
              label="Priority" label_width="50" left="10" max_val="4" min_val="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_area_search.xml b/linden/indra/newview/skins/default/xui/en-us/floater_area_search.xml
index a3ec84f..9022c25 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_area_search.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_area_search.xml
@@ -15,7 +15,7 @@
         <line_editor name="Description query chunk" tool_tip=""
                 bevel_style="in" border_style="line" border_thickness="1"
                 height="20" width="200" left_delta="206" bottom_delta="0" follows="left|top"
-                font="SansSerifSmall" max_length="256" mouse_opaque="true" />
+                font="SansSerifSmall" max_length="256" mouse_opaque="true" spell_check="true" />
         <text name="owner_label" bottom_delta="-20" follows="top|left" height="15" left="12">
                 Owner search string:
         </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
index 6d74882..9f55f67 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_busy.xml
@@ -61,7 +61,7 @@
   
   <text_editor type="string" length="1" bottom_delta="-85" embedded_items="false" enabled="true"
      follows="left|top" font="SansSerifSmall" height="75" left_delta="-15" max_length="1100"
-     mouse_opaque="true" name="im_response" width="245" word_wrap="true"/>
+     mouse_opaque="true" name="im_response" width="245" word_wrap="true" spell_check="true" />
 
   <check_box bottom_delta="-30" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
      initial_value="false" label="Send an item along with the response" left_delta="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index 7cd895f..3370ea8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -67,7 +67,7 @@
         <text_editor bottom_delta="-242" enabled="false"
              follows="top|right" font="SansSerifSmall" height="237" left="444"
              max_length="65535" name="covenant_editor" right="725"
-             width="271" word_wrap="true">
+             width="271" word_wrap="true" spell_check="true">
                 Loading...
         </text_editor>
         <check_box follows="left|top" height="20" label="I Agree to the Covenant Defined Above."
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 74fe708..e83a930 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -111,7 +111,7 @@
                                      handle_edit_keys_directly="false" height="20" label="Click here to chat."
                                      left="0" max_length="2147483647" mouse_opaque="true" name="Chat Editor"
                                      right="-70" select_all_on_focus_received="false" select_on_focus="false"
-                                     tab_group="1" />
+                                     tab_group="1" spell_check="true" />
                                 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
                                      list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
                                      width="70">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 3e300da..0424b72 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -27,7 +27,7 @@
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                              follows="left|top" font="SansSerif" height="18" left_delta="38"
-                             max_length="63" mouse_opaque="true" name="name" width="128" />
+                             max_length="63" mouse_opaque="true" name="name" width="128" spell_check="true" />
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
                              name="Search" width="70" />
@@ -83,7 +83,7 @@
                              label="Search" left_delta="56" max_length="254" mouse_opaque="true"
                              name="search_editor" select_all_on_focus_received="false"
                              select_on_focus="false" tab_group="1" tool_tip="Search the web"
-                             width="160" />
+                             width="160" spell_check="true" />
                         <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20" label="Back"
                              left="230" name="back_btn" width="70" />
                         <button bottom="-26" follows="top|right" font="SansSerifSmall" height="20"
@@ -159,7 +159,7 @@
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                              follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
                         <check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
                              font="SansSerifSmall" height="16" initial_value="true"
                              label="PG content" left="420" mouse_opaque="true"
@@ -253,7 +253,7 @@
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                              follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="event_search_text" width="160" />
+                             max_length="63" mouse_opaque="true" name="event_search_text" width="160" spell_check="true" />
                         <radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
                              mouse_opaque="true" name="date_mode" width="300">
                                 <radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
@@ -508,7 +508,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                              follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
                         <check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
                              font="SansSerifSmall" height="16" initial_value="true"
                              label="PG content" left="420" mouse_opaque="true"
@@ -646,7 +646,7 @@ To buy direct, visit the land and click on the place name in the title bar.
       </text>
           <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                              follows="left|right|top" font="SansSerif" height="18" left="56"
-                             max_length="63" mouse_opaque="true" name="name" width="160" />
+                             max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
                 <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left="121" mouse_opaque="true"
                              name="Search" width="95" />
@@ -694,7 +694,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
                              follows="left|top" font="SansSerif" height="18" left_delta="38"
-                             max_length="63" mouse_opaque="true" name="name" width="200" />
+                             max_length="63" mouse_opaque="true" name="name" width="200" spell_check="true" />
                         <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
                              name="Search" width="70" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
index d0e11d6..282a2f5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
@@ -71,7 +71,7 @@
                         <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-206" embedded_items="false"
                              follows="left|top" font="SansSerifSmall" height="48" left="87"
                              max_length="511" mouse_opaque="true" name="charter"
-                             text_readonly_color="1, 1, 1, 1" width="361" word_wrap="true" />
+                             text_readonly_color="1, 1, 1, 1" width="361" word_wrap="true" spell_check="true" />
                         <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="true" label="Show In Group List" left="87"
                              mouse_opaque="true" name="sho" radio_style="false" width="361" />
@@ -119,7 +119,7 @@
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom="-90" follows="left|top" font="SansSerifSmall"
                              height="16" left_delta="75" max_length="20" mouse_opaque="true" name="ohon"
-                             text_readonly_color="1, 1, 1, 1" width="105" />
+                             text_readonly_color="1, 1, 1, 1" width="105" spell_check="true" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-90" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="right" height="16" left_delta="110"
@@ -129,7 +129,7 @@
                         <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                              border_thickness="1" bottom="-90" follows="left|top" font="SansSerifSmall"
                              height="16" left_delta="75" max_length="20" mouse_opaque="true" name="mhon"
-                             text_readonly_color="1, 1, 1, 1" width="105" />
+                             text_readonly_color="1, 1, 1, 1" width="105" spell_check="true" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-124" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
@@ -332,7 +332,7 @@ create a new proposal.
                                              bottom_delta="40" embedded_items="false" follows="left|top"
                                              font="SansSerif" height="94" left="87" max_length="255" mouse_opaque="true"
                                              name="proposal_text" text_readonly_color="1, 1, 1, 1" width="290"
-                                             word_wrap="false" />
+                                             word_wrap="false" spell_check="true" />
                                         <button bottom_delta="-22" follows="top" font="SansSerif" halign="center" height="20"
                                              label="Yes" label_selected="Yes" left="87" mouse_opaque="true"
                                              name="btn_yes" width="60" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
index 32a715e..6e72dee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
@@ -11,7 +11,7 @@
                 Description:
         </text>
         <line_editor bottom_delta="-24" follows="top|left|right" height="19" max_length="254"
-             name="description_form" width="280" />
+             name="description_form" width="280" spell_check="true" />
         <text bottom_delta="-20" follows="top|left" height="15" name="preview_label">
                 Preview image as:
         </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 5e81525..4ccfe60 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -77,13 +77,13 @@
              follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
              max_length="2147483647" mouse_opaque="true" name="im_history"
              text_color="ChatHistoryTextColor"
-       track_bottom="true" 
+                 track_bottom="true" 
              text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" />
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
              follows="left|right|bottom" font="SansSerif" height="20"
              label="Click here to instant message" left="5" max_length="1022"
              mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-             select_on_focus="false" tab_group="1" width="423" />
+             select_on_focus="false" tab_group="1" width="423" spell_check="true" />
         <button bottom="7" follows="right|bottom" font="SansSerif" halign="center" height="20"
              label="Send" left="433" mouse_opaque="true" name="send_btn"
              scale_image="true" width="60" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
index cac33d7..a059cde 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -48,7 +48,7 @@
                              bottom="-265" embedded_items="false" enabled="false"
                              follows="left|top|right|bottom" font="SansSerif" height="239" left="5"
                              max_length="2147483647" mouse_opaque="true" name="im_history"
-           track_bottom="true" 
+                                 track_bottom="true" 
                              text_color="ChatHistoryTextColor"
                              text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
@@ -56,7 +56,7 @@
                              handle_edit_keys_directly="false" height="20"
                              label="Click here to instant message" left="5" max_length="1022"
                              mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-                             select_on_focus="false" tab_group="1" width="426" />
+                             select_on_focus="false" tab_group="1" width="426" spell_check="true" />
                         <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
                              halign="center" height="20" label="Send" left="436" mouse_opaque="true"
                              name="send_btn" scale_image="true" width="60" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index 072ac14..82311cd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -67,14 +67,14 @@
                              follows="left|top|right|bottom" font="SansSerif" left="4"
                              max_length="2147483647" mouse_opaque="true" name="im_history"
                              text_color="ChatHistoryTextColor"
-           track_bottom="true" 
+                                 track_bottom="true" 
                              text_readonly_color="ChatHistoryTextColor" top="104" width="170"
                              word_wrap="true" />
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
                              enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
                              left="5" max_length="1022" mouse_opaque="true" name="chat_editor"
                              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-                             width="106" />
+                             width="106" spell_check="true" />
                         <button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
                              halign="center" height="20" label="Send" left="116" mouse_opaque="true"
                              name="send_btn" scale_image="true" width="60" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
index 5b111eb..88992a2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
@@ -24,7 +24,7 @@
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-61"
              enabled="true" follows="left|top|right" font="SansSerifSmall" height="16"
              is_unicode="false" left="88" max_length="127" mouse_opaque="true"
-             name="LabelItemDesc" width="252" />
+             name="LabelItemDesc" width="252" spell_check="true" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-81" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml b/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
index a91d9e2..e319293 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
@@ -11,7 +11,7 @@
                 Description:
         </text>
         <line_editor follows="top|left|right" height="19" max_length="254" name="description_form"
-             width="280" />
+             width="280" spell_check="true" />
         <button bottom="10" follows="bottom|right" height="20" label="Cancel" left="182"
              name="cancel_btn" width="64" />
         <button bottom="10" follows="bottom|left" height="20" label="Upload ([UPLOADFEE])" left="31"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
index 51cd2f5..81dd05a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -265,7 +265,7 @@ now wearing into it.
              enabled="true" follows="left|top" font="SansSerif"
              handle_edit_keys_directly="true" height="20" left="13" max_length="63"
              mouse_opaque="true" name="name ed" select_all_on_focus_received="false"
-             select_on_focus="false" width="489">
+             select_on_focus="false" width="489" spell_check="true">
                 New Outfit
         </line_editor>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
index be53b41..3938a90 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
@@ -43,7 +43,7 @@
         <line_editor name="message" max_length="140"
                      bottom_delta="1" left="80" height="18" right="-15"
                      bevel_style="in" border_style="line" border_thickness="1"
-                     follows="left|top|right" font="SansSerif" />
+                     follows="left|top|right" font="SansSerif" spell_check="true" />
 
 
         <text name="amount text"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index 97cbeb8..fd2ad39 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
@@ -25,13 +25,13 @@
         </text>
         <line_editor bottom_delta="-6" follows="left|top" height="20"
              label="Type your subject here." left="120" max_length="100"
-             name="subject_form" width="150" />
+             name="subject_form" width="150" spell_check="true" />
         <text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
              name="msg_label">
                 Message:
         </text>
         <text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140" left="12"
-             max_length="700" name="msg_form" width="420">
+             max_length="700" name="msg_form" width="420" spell_check="true">
                 Type your message here.
         </text_editor>
         <text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
index 657898a..3eef081 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
@@ -6,7 +6,7 @@
              enabled="true" follows="left|top|right" font="SansSerif"
              handle_edit_keys_directly="false" height="19" left="93" max_length="127"
              mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="194" />
+             select_on_focus="false" width="194" spell_check="true" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerif" h_pad="0" halign="left" height="19" left="13"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
index 09fe2c0..590ff32 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
@@ -19,7 +19,7 @@
                 Description:
         </text>
         <line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="254"
-             name="desc" width="330" />
+             name="desc" width="330" spell_check="true" />
         <text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
              name="trigger_label">
                 Trigger:
@@ -34,7 +34,7 @@
         <line_editor bottom_delta="-6" follows="left|top" height="20" left="300" max_length="31"
              name="replace_editor"
              tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
-             width="130" />
+             width="130" spell_check="true" />
         <text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
              name="key_label">
                 Shortcut Key:
@@ -78,7 +78,7 @@ unless you add wait steps.
         <combo_box bottom_delta="0" follows="top|left" height="20" left_delta="0"
              name="sound_list" width="100" />
         <line_editor bottom_delta="0" follows="top|left" height="20" left_delta="0" max_length="127"
-             name="chat_editor" width="100" />
+             name="chat_editor" width="100" spell_check="true" />
         <radio_group bottom_delta="-20" draw_border="false" follows="top|left" height="40"
              left="340" name="animation_trigger_type" width="80">
                 <radio_item bottom_delta="-5" follows="left|top" height="16" left="3" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
index a625598..fe2d977 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
@@ -16,7 +16,7 @@
              enabled="true" follows="left|top|right" font="SansSerif"
              handle_edit_keys_directly="false" height="19" left="93" max_length="127"
              mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="294" />
+             select_on_focus="false" width="294" spell_check="true" />
         <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
              height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
              tear_off="false" width="220">
@@ -55,7 +55,7 @@
         <text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
              follows="left|top|right|bottom" font="SansSerif" height="285"
              ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-             name="Notecard Editor" width="392" word_wrap="true">
+             name="Notecard Editor" width="392" word_wrap="true" spell_check="true">
                 Loading...
         </text_editor>
         <button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
index ec3ce5a..f2be796 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
@@ -16,7 +16,7 @@
              enabled="true" follows="left|top|right" font="SansSerif"
              handle_edit_keys_directly="false" height="19" left="93" max_length="127"
              mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="294" />
+             select_on_focus="false" width="294" spell_check="true" />
         <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
              height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
              tear_off="false" width="220">
@@ -55,7 +55,7 @@
         <text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
              follows="left|top|right|bottom" font="SansSerif" height="285"
              ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-             name="Notecard Editor" width="392" word_wrap="true">
+             name="Notecard Editor" width="392" word_wrap="true" spell_check="true">
                 Loading...
         </text_editor>
         <button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
index 9ac36d3..0c422f1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
@@ -6,7 +6,7 @@
              enabled="true" follows="left|top|right" font="SansSerif"
              handle_edit_keys_directly="false" height="19" left="95" max_length="127"
              mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="192" />
+             select_on_focus="false" width="192" spell_check="true" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerif" h_pad="0" halign="left" height="19" left="13"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
index f52b1b6..2ca2197 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
@@ -13,7 +13,7 @@
              enabled="true" follows="left|top|right" font="SansSerif"
              handle_edit_keys_directly="false" height="19" left="93" max_length="127"
              mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="229" />
+             select_on_focus="false" width="229" spell_check="true" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="10" drop_shadow_visible="true" enabled="true" follows="left|bottom"
              font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
index 3c4a44d..2c24f45 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
@@ -12,7 +12,7 @@
              enabled="true" follows="left|top|right" font="SansSerif"
              handle_edit_keys_directly="false" height="19" left="93" max_length="127"
              mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="194" />
+             select_on_focus="false" width="194" spell_check="true" />
         <button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
              halign="center" height="20" label="Keep" label_selected="Keep" left="9"
              mouse_opaque="true" name="Keep" scale_image="true" width="100" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
index ca1cfb1..7dad867 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
@@ -206,7 +206,7 @@ Other
              border_thickness="1" bottom_delta="-18" follows="left|top"
              font="SansSerifSmall" height="16" left="16" max_length="64"
              mouse_opaque="true" name="summary_edit" 
-             width="356" />
+             width="356" spell_check="true" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -224,7 +224,7 @@ if possible.
         <text_editor bottom_delta="-152" embedded_items="false"
              follows="left|top" font="SansSerifSmall" height="146" left="16"
              max_length="800" mouse_opaque="false" name="details_edit"
-             width="356" word_wrap="true" />
+             width="356" word_wrap="true" spell_check="true" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
index 9499690..83d7a5c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
@@ -141,7 +141,7 @@
              border_thickness="1" bottom_delta="-16" follows="left|top"
              font="SansSerifSmall" height="16" left="16" max_length="64"
              mouse_opaque="true" name="summary_edit" 
-             width="356" />
+             width="356" spell_check="true" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
@@ -151,7 +151,7 @@
         <text_editor bottom_delta="-112" embedded_items="false"
              follows="left|top" font="SansSerifSmall" height="112" left="16"
              max_length="900" mouse_opaque="false" name="details_edit"
-             width="356" word_wrap="true">
+             width="356" word_wrap="true" spell_check="true">
                 Steps to reproduce the bug:
 
 Observed results:
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index 82a65b8..50721ab 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
              embedded_items="false" enabled="true" follows="left|top|right|bottom"
              font="Monospace" height="376" ignore_tab="false" left="4"
              max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-             word_wrap="true" show_line_numbers="true">
+             word_wrap="true" show_line_numbers="true" spell_check="true">
                 Loading...
         </text_editor>
         <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
index 167aeb7..2e79da2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
@@ -19,5 +19,5 @@
              enabled="true" follows="left|top|right" font="SansSerif"
              handle_edit_keys_directly="false" height="19" left="93" max_length="127"
              mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="394" />
+             select_on_focus="false" width="394" spell_check="true" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_search_replace.xml b/linden/indra/newview/skins/default/xui/en-us/floater_search_replace.xml
index 930cf37..f31f357 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_search_replace.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_search_replace.xml
@@ -31,10 +31,10 @@
              enabled="true" follows="left|top" font="SansSerifSmall"
              handle_edit_keys_directly="false" height="16" left="55" max_length="254"
              mouse_opaque="true" name="search_text" select_all_on_focus_received="false"
-             select_on_focus="false" width="240" />
+             select_on_focus="false" width="240" spell_check="true" />
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-58"
              enabled="true" follows="left|top" font="SansSerifSmall"
              handle_edit_keys_directly="false" height="16" left="55" max_length="254"
              mouse_opaque="true" name="replace_text"
-             select_all_on_focus_received="false" select_on_focus="false" width="240" />
+             select_all_on_focus_received="false" select_on_focus="false" width="240" spell_check="true" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
index 3738077..0a755e8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
@@ -19,7 +19,7 @@
         </text>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-23"
              follows="left|top|right" font="SansSerifSmall" height="19" left="10"
-             max_length="127" mouse_opaque="true" name="description_form" width="280" />
+             max_length="127" mouse_opaque="true" name="description_form" width="280" spell_check="true" />
         <button bottom="-180" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Cancel" label_selected="Cancel" left="200"
              mouse_opaque="true" name="cancel_btn" width="90" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index e473ad7..0cb4a59 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -348,7 +348,7 @@
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
                              follows="left|top|right" font="SansSerifSmall" height="16" left="88"
                              max_length="127" mouse_opaque="true" name="Object Description"
-                             select_all_on_focus_received="true" width="172" />
+                             select_all_on_focus_received="true" width="172" spell_check="true" />
       
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-66" drop_shadow_visible="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 5c794c0..9bc4d7e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -143,7 +143,7 @@
       <text_editor bottom_delta="-137" embedded_items="false"
                              enabled="true" follows="left|top" font="SansSerifSmall" height="137"
                              is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
-                             name="about" width="235" word_wrap="true" />
+                             name="about" width="235" word_wrap="true" spell_check="true" />
 
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
@@ -243,7 +243,7 @@
       <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
                              name="chk7" width="92" />
-      <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line" spell_check="true"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="80"
                              max_length="254" mouse_opaque="true" name="want_to_edit"
@@ -272,7 +272,7 @@
       <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Custom Characters" left_delta="170"
                              mouse_opaque="true" name="schk5" width="127" />
-      <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line" spell_check="true"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="80"
                              max_length="254" mouse_opaque="true" name="skills_edit"
@@ -283,7 +283,7 @@
                              mouse_opaque="true" name="Languages:" v_pad="0" width="70">
         Languages:
       </text>
-      <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line" spell_check="true"
                              border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="80"
                              max_length="254" mouse_opaque="true" name="languages_edit"
@@ -355,7 +355,7 @@
       <text_editor bottom_delta="-179" embedded_items="false"
                              enabled="true" follows="left|top" font="SansSerifSmall" height="178"
                              is_unicode="false" left="12" max_length="254" mouse_opaque="false"
-                             name="about" width="378" word_wrap="true" />
+                             name="about" width="378" word_wrap="true" spell_check="true" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
@@ -373,7 +373,7 @@
       <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
                              font="SansSerif" height="256" is_unicode="false" left="10"
                              max_length="1023" mouse_opaque="true" name="notes edit" width="400"
-                             word_wrap="false" />
+                             word_wrap="false" spell_check="true" />
     </panel>
   </tab_container>
   <button bottom="-508" font="SansSerif" halign="center" height="20" label="OK"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
index 5789474..f985b35 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
@@ -3,13 +3,13 @@
      name="Classified" title="Classified" width="350">
         <texture_picker bottom="-165" follows="left|top" height="155" left="10" name="snapshot_ctrl"
              width="207" />
-        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top" spell_check="true"
              font="SansSerif" height="20" left="10" name="given_name_editor"
              tool_tip="Name must begin with a letter or number, not punctuation."
              width="280" />
         <text_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="70" left="10" max_length="1023"
-             name="desc_editor" width="280" word_wrap="true" />
+             name="desc_editor" width="280" word_wrap="true" spell_check="true" />
         <line_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="20" left="10" name="location_editor"
              tool_tip="Set the location for this classified to your current position."
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
index af8b58c..9e67252 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
@@ -8,7 +8,7 @@
              width="290" />
         <text_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="100" left="10" max_length="1023"
-             name="desc_editor" width="290" word_wrap="true" />
+             name="desc_editor" width="290" word_wrap="true" spell_check="true" />
         <line_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="20" left="10" name="location_editor"
              width="290" />
@@ -23,7 +23,7 @@
                 Sort:
         </text>
         <line_editor bottom_delta="5" follows="left|top" height="16" left="280"
-             name="sort_order_editor" width="25" />
+             name="sort_order_editor" width="25" spell_check="true" />
         <check_box bottom_delta="0" follows="left|top" height="20" label="Enabled" left="360"
              name="enabled_check" width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 780da86..dd5bf2d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -13,7 +13,7 @@
                          max_val="1000000" min_val="0" mouse_opaque="true" name="channel_control"
                          width="100" tool_tip="Set the default channel for inworld chat"/>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
-             follows="left|right|bottom" font="SansSerif"
+             follows="left|right|bottom" font="SansSerif" spell_check="true"
              handle_edit_keys_directly="false" height="20" label="Click here to chat."
              left="212" max_length="254" name="Chat Editor"
              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
index 3c292e9..ecfa468 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
@@ -6,10 +6,10 @@
         <line_editor bottom_delta="-8" enabled="false" follows="left|top"
              font="SansSerif" height="20" left="20" name="given_name_editor"
              tool_tip="Name must begin with a letter or number, not punctuation."
-             width="400" />
+             width="400" spell_check="true" />
         <text_editor enabled="false" follows="left|top"
              font="SansSerifSmall" height="90" left="20" max_length="1023"
-             name="desc_editor"  width="400" word_wrap="true" />
+             name="desc_editor"  width="400" word_wrap="true" spell_check="true" />
         <line_editor enabled="false" follows="left|top" font="SansSerif"
              height="20" left="20" name="location_editor" 
              tool_tip="Set the location for this classified to your current position."
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_event.xml b/linden/indra/newview/skins/default/xui/en-us/panel_event.xml
index 99156ee..6fa8904 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_event.xml
@@ -75,7 +75,7 @@
                 Description:
         </text>
         <text_editor bottom_delta="-230" follows="left|top" height="220" left="20" max_length="1024"
-             name="event_desc" width="400" />
+             name="event_desc" width="400" spell_check="true" />
         <button bottom_delta="-24" follows="left|top" height="20" label="Teleport" left="20"
              name="teleport_btn" width="140" />
         <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="165"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index a967a90..3e69d15 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -18,7 +18,7 @@ Hover your mouse over the options for more help.
              bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
              h_pad="0" halign="left" height="16" label="Type your new group name here"
              left="7" max_length="35" mouse_opaque="true" name="group_name_editor"
-             prevalidate="ascii" v_pad="0" width="300" />
+             prevalidate="ascii" v_pad="0" width="300" spell_check="true" />
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-20" drop_shadow_visible="true" follows="left|top"
              font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
@@ -47,7 +47,7 @@ Hover your mouse over the options for more help.
              font="SansSerifSmall" h_pad="0" halign="left" height="160"
              hide_scrollbar="true" max_length="511" mouse_opaque="true" name="charter"
              right="410" v_pad="0"
-             width="265" word_wrap="true">
+             width="265" word_wrap="true" spell_check="true">
                 Group Charter
         </text_editor>
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
index 0e5e84d..bca87d9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
@@ -74,7 +74,8 @@ and you can&apos;t send a folder.
                 <line_editor bevel_style="in" border_style="line"
                      border_thickness="1" bottom_delta="0" font="SansSerifSmall" height="16"
                      is_unicode="false" left_delta="58" max_length="63" mouse_opaque="true"
-                     name="create_subject" prevalidate="printable_not_pipe" width="264" />
+                     name="create_subject" prevalidate="printable_not_pipe" width="264" 
+                         spell_check="true" />
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="-18" drop_shadow_visible="true" font="SansSerifSmall"
                      h_pad="0" halign="right" height="16" left="7" mouse_opaque="true"
@@ -84,7 +85,7 @@ and you can&apos;t send a folder.
                 <text_editor bottom_delta="-106" embedded_items="false"
                      font="SansSerifSmall" height="120" hide_scrollbar="true" is_unicode="false"
                      left_delta="58" max_length="511" mouse_opaque="true" name="create_message"
-                     width="346" word_wrap="true" />
+                     width="346" word_wrap="true" spell_check="true" />
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="-19" drop_shadow_visible="true" font="SansSerifSmall"
                      h_pad="0" halign="right" height="16" left="7" mouse_opaque="true"
@@ -94,7 +95,7 @@ and you can&apos;t send a folder.
                 <line_editor bg_visible="false" border_visible="false" bottom_delta="-2" enabled="false"
                      font="SansSerifSmall" height="16" is_unicode="false" left_delta="59"
                      max_length="63" mouse_opaque="false" name="create_inventory_name"
-                     width="211" />
+                     width="211" spell_check="true" />
                 <icon bottom_delta="0" height="16" left_delta="0" mouse_opaque="false"
                      name="create_inv_icon" width="16" />
                 <button bottom_delta="0" font="SansSerif" halign="center" height="20"
@@ -146,7 +147,7 @@ and you can&apos;t send a folder.
                      enabled="false" font="SansSerifSmall" height="206" hide_scrollbar="true"
                      is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
                      name="view_message" width="404"
-                     word_wrap="true" />
+                     word_wrap="true" spell_check="true" />
                 <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
                      label="Open Attachment" label_selected="Open Attachment" left="7"
                      mouse_opaque="true" name="open_attachment" width="110" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index bd64622..e5b621e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -95,7 +95,7 @@ clicking on their names.
                         <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                              height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
-                             name="search_text" width="100" />
+                             name="search_text" width="100" spell_check="true" />
                         <button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
                              label="Search" left_delta="105" name="search_button" width="60" />
                         <button bottom_delta="0" enabled="false" font="SansSerifSmall" halign="center"
@@ -135,7 +135,7 @@ including the Everyone and Owner Roles.
                         <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                              height="16" is_unicode="false" left="6" max_length="63" mouse_opaque="true"
-                             name="search_text" width="100" />
+                             name="search_text" width="100" spell_check="true" />
                         <button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
                              label="Search" left_delta="105" name="search_button" width="60" />
                         <button bottom_delta="0" enabled="false" font="SansSerifSmall" halign="center"
@@ -212,7 +212,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                      bottom_delta="-16" drop_shadow_visible="false" follows="left|top"
                      font="SansSerifSmall" height="16" is_unicode="false" left="0"
                      max_length="20" mouse_opaque="true" name="role_title"
-                     width="145">
+                     width="145" spell_check="true">
                         (waiting)
                 </line_editor>
                 <text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -220,7 +220,7 @@ things in this group. There&apos;s a broad variety of Abilities.
                      h_pad="0" halign="left" height="48" hide_scrollbar="true" left="150"
                      max_length="254" name="role_description"
                      v_pad="0" width="254"
-                     word_wrap="true">
+                     word_wrap="true" spell_check="true">
                         (waiting)
                 </text_editor>
                 <text bottom_delta="-26" font="SansSerif" halign="left" height="16" left="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
index e044f34..168b60b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
@@ -57,7 +57,7 @@ vote on open proposals, and view old proposals.
              border_visible="false" bottom="300" drop_shadow_visible="false"
              embedded_items="false" follows="left|top" font="SansSerif" height="90"
              is_unicode="false" left="11" max_length="254" mouse_opaque="true"
-             name="proposal_text" width="289" word_wrap="true" />
+             name="proposal_text" width="289" word_wrap="true" spell_check="true" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="20" label="View List" label_selected="View List" left="304"
              mouse_opaque="true" name="btn_view_proposal_list" width="101" />
@@ -180,7 +180,7 @@ vote on open proposals, and view old proposals.
              hide_scrollbar="true" is_unicode="false" left="10" max_length="1024"
              mouse_opaque="true" name="vote_text"
              text_wrap="true" v_pad="0"
-             width="396" word_wrap="false" />
+             width="396" word_wrap="false" spell_check="true" />
         <button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
              label="View List" label_selected="View List" left="287" mouse_opaque="true"
              name="btn_view_history_list" width="120" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_place.xml b/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
index d50aa53..96d9dd5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
@@ -14,7 +14,7 @@
         </text>
         <text_editor bottom_delta="-68" enabled="false" follows="left|top"
              font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-             width="400" word_wrap="true" />
+             width="400" word_wrap="true" spell_check="true" />
         <text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
                 Information:
         </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
index 94024f9..64ab9f3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
@@ -14,7 +14,7 @@
         </text>
         <text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
              font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-             width="360" word_wrap="true" />
+             width="360" word_wrap="true" spell_check="true" />
         <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
                 Information:
         </text>
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 cac3ef1..a0c9e28 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
@@ -138,39 +138,46 @@
       <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?"
          name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
          right="490" width="18"/>
-      <text bottom="-20" follows="left|top" font="SansSerifSmall" height="16" left="210"
-         name="EmSpell_txt1" width="512">Base Language</text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="-110" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="300"
+      <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"
+         control_name="EmeraldSpellDisplay" width="126"/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt1" width="512">
+        Current language (dictionary):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmeraldSpellBase" width="250"
          control_name="EmeraldSpellBase" tool_tip=""/>
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="5"
-         name="EmSpell_txt2" width="512">Additional installed dictionaries</text>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt3" width="512">
+        Downloaded languages (dictionaries):
+      </text>
       <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="180"
-         control_name="EmSpell_Installed" tool_tip=""/>
-      <button bottom_delta="-0" follows="left|top" font="SansSerifSmall" height="18" label="Remove"
-       name="EmSpell_Remove" tool_tip="" left_delta="182" width="60"/>
-      <text bottom_delta="20" follows="left|top" font="SansSerifSmall" height="16" left="270"
-         name="EmSpell_txt3" width="512">Available dictionaries</text>
-      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="-10" follows="left|top" height="18"
-         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="180"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
          control_name="EmSpell_Avail" tool_tip=""/>
-      <button bottom_delta="-0" follows="left|top" font="SansSerifSmall" height="18" label="Install"
-       name="EmSpell_Add" tool_tip="" left_delta="182" width="50"/>
-      <button bottom_delta="20" follows="left|top" font="SansSerifSmall" height="18" label="Get More!"
-         name="EmSpell_GetMore" tool_tip="" left_delta="-20" width="70"/>
-      <check_box bottom_delta="-50" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-       label="Show misspelled words in red (requires restart)" left="5" mouse_opaque="true" name="EmeraldSpellDisplay"
-       control_name="EmeraldSpellDisplay" width="126"/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
+         name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
+      <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
+         name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt2" width="512">
+        Additional custom languages (dictionaries):
+      </text>
+      <combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="18"
+         max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
+         control_name="EmSpell_Installed" tool_tip=""/>
+      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
+         name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
       <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
          name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
-      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="5"
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
          name="EmSpell_txt4" width="512">
-        To spellcheck, right click a misspelled word
-        (red or not) and click on its replacement
+To use spellcheck, right-click a misspelled word
+(red or otherwise) and select its replacement
       </text>
-      <button name="ac_button" label="AutoCorrect Options…" halign="center" tool_tip="Modify the AutoCorrect word list and settings" left="5"
-        bottom_delta="-64" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+      <button name="ac_button" label="AutoCorrect Options..." halign="center"
+         tool_tip="Modify the AutoCorrect word list and settings" left="12"
+         bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
     </panel>
     
     <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Extra" 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index c2b8c2b..bb5002b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -61,7 +61,7 @@
   </text>
   <text_editor type="string" length="1" bottom_delta="-60" embedded_items="false" enabled="true" follows="left|top"
              font="SansSerifSmall" height="70" left="148" max_length="255"
-             mouse_opaque="true" name="busy_response" width="330" word_wrap="true" />
+             mouse_opaque="true" name="busy_response" width="330" word_wrap="true" spell_check="true" />
   <button bottom_delta="-25" follows="top|right" height="22" label="IM Response Options"
      left="164" name="busy_adv_btn" tool_tip="Instant message Auto-Response options"
      width="180" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
index 5e28bdc..9bbdbd3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
@@ -48,7 +48,7 @@
         <text_editor type="string" length="1" bottom="-279" embedded_items="false" enabled="false"
              follows="left|top" font="SansSerifSmall" height="194"
              left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
-             width="340" word_wrap="true">
+             width="340" word_wrap="true" spell_check="true">
                 There is no Covenant provided for this Estate.
         </text_editor>
         <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="18"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 1ef815e..46ba64a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -96,8 +96,8 @@
              font="SansSerifSmall" handle_edit_keys_directly="false" height="11"
              label="Search" left="-94" max_length="254" mouse_opaque="true"
              name="search_editor" select_all_on_focus_received="false"
-             select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-             width="78"/>
+             select_on_focus="false" tab_group="1" tool_tip="Inworld search"
+             width="78" spell_check="true"/>
         <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
              halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png"
              label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml b/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
index 03d0919..85ad350 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
@@ -8,7 +8,7 @@
              width="400" />
         <text_editor enabled="false" follows="left|top" font="SansSerif"
              height="90" left="20" max_length="1023" name="desc_editor"
-             width="400" word_wrap="true" />
+             width="400" word_wrap="true" spell_check="true" />
         <line_editor enabled="false" follows="left|top" font="SansSerif"
              height="20" left="20" name="location_editor" 
              width="400" />
@@ -23,7 +23,7 @@
                 Sort:
         </text>
         <line_editor bottom_delta="5" follows="left|top" height="16" left="320"
-             name="sort_order_editor" width="25" />
+             name="sort_order_editor" width="25" spell_check="true" />
         <check_box bottom_delta="0" follows="left|top" height="20" label="Enabled" left="360"
              name="enabled_check" width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
deleted file mode 100644
index a5de96c..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="4" enabled="true" height="240" left="8"
-     mouse_opaque="true" name="content_panel" width="404">
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-             enabled="false" font="SansSerifSmall" height="85" hide_border="true"
-             hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
-             name="voice_intro_text1" tab_stop="false" width="400" word_wrap="true">
-                Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone.
-        </text_editor>
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-             enabled="false" font="SansSerifSmall" height="50" hide_border="true"
-             hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
-             name="voice_intro_text2" tab_stop="false" width="400" word_wrap="true">
-                Voice Chat is enabled by default. Do you wish to continue using Voice Chat?
-        </text_editor>
-        <radio_group bottom_delta="-30" draw_border="false" enabled="true" follows="left|top"
-             height="40" left="10" mouse_opaque="true" name="voice_enable" width="364">
-                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="1" width="315">
-                        Yes, continue using Voice Chat.
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="0" width="315">
-                        No, disable Voice Chat.
-                </radio_item>
-        </radio_group>
-        <text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-50"
-             embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
-             hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
-             name="voice_intro_text3" tab_stop="false" width="400" word_wrap="true">
-                You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences.
-        </text_editor>
-        <text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="0"
-             embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
-             hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
-             name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">
-                Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life.
-        </text_editor>
-</panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
deleted file mode 100644
index 4c6edfd..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="36" height="240" left="8" name="content_panel"
-     width="404">
-        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-             enabled="false" font="SansSerifSmall" height="30" hide_border="true"
-             hide_scrollbar="true" left_delta="0" max_length="65535"
-             name="voice_intro_text1" tab_stop="false" width="414" word_wrap="true">
-                Use the options below to configure your Voice Chat experience.
-        </text_editor>
-        <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" left="10"
-             name="ear_location" width="364">
-                <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
-                        Hear Voice Chat from camera position.
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
-                        Hear Voice Chat from avatar position.
-                </radio_item>
-        </radio_group>
-        <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Only allow Friends to initiate Voice Calls with me" left="20"
-             left_delta="2" name="friends_only_check" width="200" />
-        <check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Use Push-to-Talk in toggle mode" left_delta="0"
-             name="push_to_talk_toggle_check" width="200" />
-        <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
-             embedded_items="false" follows="left|top" font="SansSerifSmall" height="16"
-             hide_border="true" hide_scrollbar="true" left_delta="4" max_length="65535"
-             name="push_to_talk_label" width="445" word_wrap="true">
-                Push-to-Talk trigger:
-        </text>
-        <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
-             control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"
-             follows="top|left" font="SansSerifSmall" halign="right" height="19"
-             left_delta="0" max_length="254" name="modifier_combo" width="280" />
-        <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Set Key" left_delta="0" name="set_voice_hotkey_button"
-             width="115" />
-        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="20" label="Middle Mouse Button" left_delta="120"
-             name="set_voice_middlemouse_button" width="160" />
-</panel>