Spell check added

2011-04-23 18:08:59 -04:00
parent 0b9a44a842
commit af203533b3
73 changed files with 2442 additions and 200 deletions
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -9,6 +9,7 @@ include(DirectX)
 include(ELFIO)
 include(FMOD)
 include(OPENAL)
+include(HUNSPELL)
 include(FindOpenGL)
 include(JsonCpp)
 include(LLAddBuildTest)
@@ -43,6 +44,7 @@ endif (WINDOWS)

 include_directories(
    ${DBUSGLIB_INCLUDE_DIRS}
+    ${HUNSPELL_INCLUDE_DIR}
    ${ELFIO_INCLUDE_DIR}
    ${JSONCPP_INCLUDE_DIRS}
    ${LLAUDIO_INCLUDE_DIRS}
@@ -67,6 +69,8 @@ set(viewer_SOURCE_FILES
    slfloatermediafilter.cpp
    floaterlocalassetbrowse.cpp
    aoremotectrl.cpp
+    lgghunspell_wrapper.cpp
+    lggdicdownload.cpp
    floaterao.cpp
    floatervoicelicense.cpp
    cofmgr.cpp
@@ -561,6 +565,8 @@ set(viewer_HEADER_FILES
    hipporestrequest.h
    hippopanelgrids.h
    jcfloaterareasearch.h
+    lggdicdownload.h
+    lgghunspell_wrapper.h
    chatbar_as_cmdline.h
    qtoolalign.h
    llagent.h
@@ -1440,6 +1446,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
    ${WINDOWS_LIBRARIES}
    ${XMLRPCEPI_LIBRARIES}
    ${ELFIO_LIBRARIES}
+    ${HUNSPELL_LIBRARY}
    )

 if (LINUX)
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11276,6 +11276,17 @@
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>SpellDownloadURL</key>
+    <map>
+      <key>Comment</key>
+      <string>Base url for download dictionaries</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>http://kokuaviewer.org/app/dics/</string>
+    </map>
    <key>StatsAutoRun</key>
    <map>
      <key>Comment</key>
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -672,6 +672,39 @@
 			<string>Boolean</string>
 		<key>Value</key>
 			<integer>0</integer>
-    	</map>
+    </map>
+  <key>SpellDisplay</key>
+    <map>
+      <key>Comment</key>
+      <string>Turn on to highlight misspelled text in line edit boxes</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+  <key>SpellInstalled</key>
+    <map>
+      <key>Comment</key>
+      <string>The list of installed dictionaries</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>EN_SL</string>
+    </map>
+  <key>SpellBase</key>
+    <map>
+      <key>Comment</key>
+      <string>The base dictionary to spell check with</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>English (United States of America)</string>
+    </map>
  </map>
 </llsd>
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -48,67 +48,11 @@
 #include "llwind.h"
 #include "llviewernetwork.h"
 #include "pipeline.h"
-
-//System page ------------------------------------------------------------------------------ -HgB
-class LLPrefsAscentSysImpl : public LLPanel
-{
-public:
-	LLPrefsAscentSysImpl();
-	/*virtual*/ ~LLPrefsAscentSysImpl() { };
-
-	virtual void refresh();
-
-	void apply();
-	void cancel();
-
-private:
-	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
-	void refreshValues();
-	//General -----------------------------------------------------------------------------
-	BOOL mDoubleClickTeleport;
-		BOOL mResetCameraAfterTP;
-		BOOL mOffsetTPByUserHeight;
-	BOOL mPreviewAnimInWorld;
-	BOOL mSaveScriptsAsMono;
-	BOOL mAlwaysRezInGroup;
-	//Disable Teleport Progress
-	//Disable Logout progress
-	//always show Build
-	BOOL mAlwaysShowFly;
-	//Disable camera minimum distance
-	BOOL mPowerUser;
-	BOOL mUseSystemFolder;
-	BOOL mUploadToSystem;
-	//Chat/IM -----------------------------------------------------------------------------
-	BOOL mHideNotificationsInChat;
-	BOOL mPlayTypingSound;
-	BOOL mHideTypingNotification;
-	BOOL mEnableMUPose;
-	BOOL mEnableOOCAutoClose;
-	U32 mLinksForChattingObjects;
-	U32 mTimeFormat;
-	U32 mDateFormat;
-	BOOL mSecondsInChatAndIMs;
-	//Performance -------------------------------------------------------------------------
-	BOOL mFetchInventoryOnLogin;
-	BOOL mEnableLLWind;
-	BOOL mEnableClouds;
-	BOOL mEnableClassicClouds;
-	BOOL mSpeedRez;
-	U32 mSpeedRezInterval;
-	//Command Line ------------------------------------------------------------------------
-	//Privacy -----------------------------------------------------------------------------
-	BOOL mBroadcastViewerEffects;
-	BOOL mDisablePointAtAndBeam;
-	BOOL mPrivateLookAt;
-	BOOL mShowLookAt;
-	BOOL mRevokePermsOnStandUp;
-	BOOL mDisableClickSit;
-};
+#include "lgghunspell_wrapper.h"


-LLPrefsAscentSysImpl::LLPrefsAscentSysImpl()
- : LLPanel(std::string("Ascent"))
+
+LLPrefsAscentSys::LLPrefsAscentSys()
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml");
 	childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
@@ -117,18 +61,28 @@ LLPrefsAscentSysImpl::LLPrefsAscentSysImpl()
 	childSetCommitCallback("show_look_at_check", onCommitCheckBox, this);
 	childSetCommitCallback("enable_clouds", onCommitCheckBox, this);

+	childSetCommitCallback("SpellBase", onSpellBaseComboBoxCommit, this);
+    childSetAction("EmSpell_EditCustom", onSpellEditCustom, this);
+    childSetAction("EmSpell_GetMore", onSpellGetMore, this);
+    childSetAction("EmSpell_Add", onSpellAdd, this);
+    childSetAction("EmSpell_Remove", onSpellRemove, this);
+
 	refreshValues();
 	refresh();
 }

-//static
-void LLPrefsAscentSysImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
+LLPrefsAscentSys::~LLPrefsAscentSys()
 {
-	LLPrefsAscentSysImpl* self = (LLPrefsAscentSysImpl*)user_data;	
+}
+
+//static
+void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
+{
+	LLPrefsAscentSys* self = (LLPrefsAscentSys*)user_data;	
 	
 	llinfos << "Change to " << ctrl->getControlName()  << " aka " << ctrl->getName() << llendl;
 	
-	if (ctrl->getControlName() == "SpeedRez")
+	if (ctrl->getName() == "speed_rez_check")   // Why is this one getControlName() and the rest are getName()?
 	{
 		bool enabled = self->childGetValue("speed_rez_check").asBoolean();
 		self->childSetEnabled("speed_rez_interval", enabled);
@@ -158,7 +112,51 @@ void LLPrefsAscentSysImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 	}
 }

-void LLPrefsAscentSysImpl::refreshValues()
+void LLPrefsAscentSys::onSpellAdd(void* data)
+{
+	LLPrefsAscentSys* self = (LLPrefsAscentSys*)data;
+
+	if(self)
+	{
+		glggHunSpell->addButton(self->childGetValue("EmSpell_Avail").asString());
+	}
+
+	self->refresh();
+}
+
+void LLPrefsAscentSys::onSpellRemove(void* data)
+{
+	LLPrefsAscentSys* self = (LLPrefsAscentSys*)data;
+
+	if(self)
+	{
+		glggHunSpell->removeButton(self->childGetValue("EmSpell_Installed").asString());
+	}
+
+	self->refresh();
+}
+
+void LLPrefsAscentSys::onSpellGetMore(void* data)
+{
+	glggHunSpell->getMoreButton(data);
+}
+
+void LLPrefsAscentSys::onSpellEditCustom(void* data)
+{
+	glggHunSpell->editCustomButton();
+}
+
+void LLPrefsAscentSys::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
+{
+	LLComboBox* box = (LLComboBox*)ctrl;
+
+    if (box)
+	{
+		glggHunSpell->newDictSelection(box->getValue().asString());
+	}
+}
+
+void LLPrefsAscentSys::refreshValues()
 {
 	//General -----------------------------------------------------------------------------
 	mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
@@ -204,9 +202,11 @@ void LLPrefsAscentSysImpl::refreshValues()
 	mShowLookAt					= LLHUDEffectLookAt::sDebugLookAt;
 	mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
 	mDisableClickSit			= gSavedSettings.getBOOL("DisableClickSit");
+	//Text Options ------------------------------------------------------------------------
+    mSpellDisplay               = gSavedSettings.getBOOL("SpellDisplay");
 }

-void LLPrefsAscentSysImpl::refresh()
+void LLPrefsAscentSys::refresh()
 {	
 	//General -----------------------------------------------------------------------------
 	childSetValue("double_click_teleport_check",	mDoubleClickTeleport);
@@ -309,9 +309,59 @@ void LLPrefsAscentSysImpl::refresh()
 	childSetValue("show_look_at_check", mShowLookAt);
 	childSetValue("revoke_perms_on_stand_up_check", mRevokePermsOnStandUp);
 	childSetValue("disable_click_sit_check", mDisableClickSit);
+
+	//Text Options ------------------------------------------------------------------------
+    combo = getChild<LLComboBox>("SpellBase");
+
+    if (combo != NULL) 
+	{
+		combo->removeall();
+		std::vector<std::string> names = glggHunSpell->getDicts();
+
+		for (int i = 0; i < (int)names.size(); i++) 
+		{
+			combo->add(names[i]);
+		}
+
+		combo->setSimple(gSavedSettings.getString("SpellBase"));
+	}
+
+    combo = getChild<LLComboBox>("EmSpell_Avail");
+
+    if (combo != NULL) 
+	{
+		combo->removeall();
+
+		combo->add("");
+		std::vector<std::string> names = glggHunSpell->getAvailDicts();
+
+		for (int i = 0; i < (int)names.size(); i++) 
+		{
+			combo->add(names[i]);
+		}
+
+		combo->setSimple(std::string(""));
+	}
+
+    combo = getChild<LLComboBox>("EmSpell_Installed");
+
+    if (combo != NULL) 
+	{
+		combo->removeall();
+
+		combo->add("");
+		std::vector<std::string> names = glggHunSpell->getInstalledDicts();
+
+		for (int i = 0; i < (int)names.size(); i++) 
+		{
+			combo->add(names[i]);
+		}
+
+		combo->setSimple(std::string(""));
+	}
 }

-void LLPrefsAscentSysImpl::cancel()
+void LLPrefsAscentSys::cancel()
 {
 	//General -----------------------------------------------------------------------------
 	childSetValue("double_click_teleport_check",	mDoubleClickTeleport);
@@ -359,9 +409,12 @@ void LLPrefsAscentSysImpl::cancel()
 	childSetValue("enable_classic_clouds", mEnableClassicClouds);

 	gLLWindEnabled = mEnableLLWind;
+
+	//Text Options ------------------------------------------------------------------------
+    childSetValue("SpellDisplay", mSpellDisplay);
 }

-void LLPrefsAscentSysImpl::apply()
+void LLPrefsAscentSys::apply()
 {
 	std::string short_date, long_date, short_time, long_time, timestamp;
 	
@@ -500,30 +553,3 @@ void LLPrefsAscentSysImpl::apply()
 	refreshValues();
 	refresh();
 }
-
-//---------------------------------------------------------------------------
-
-LLPrefsAscentSys::LLPrefsAscentSys()
-:	impl(* new LLPrefsAscentSysImpl())
-{
-}
-
-LLPrefsAscentSys::~LLPrefsAscentSys()
-{
-	delete &impl;
-}
-
-void LLPrefsAscentSys::apply()
-{
-	impl.apply();
-}
-
-void LLPrefsAscentSys::cancel()
-{
-	impl.cancel();
-}
-
-LLPanel* LLPrefsAscentSys::getPanel()
-{
-	return &impl;
-}
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -32,10 +32,11 @@
 #ifndef ASCENTPREFSSYS_H
 #define ASCENTPREFSSYS_H

-class LLPanel;
-class LLPrefsAscentSysImpl;

-class LLPrefsAscentSys
+#include "llpanel.h"
+
+
+class LLPrefsAscentSys : public LLPanel
 {
 public:
 	LLPrefsAscentSys();
@@ -43,11 +44,60 @@ public:

 	void apply();
 	void cancel();
+    void refresh();

 	LLPanel* getPanel();

 protected:
-	LLPrefsAscentSysImpl& impl;
+	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
+    static void onSpellAdd(void* data);
+    static void onSpellRemove(void* data);
+    static void onSpellGetMore(void* data);
+    static void onSpellEditCustom(void* data);
+    static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
+	void refreshValues();
+	//General -----------------------------------------------------------------------------
+	BOOL mDoubleClickTeleport;
+		BOOL mResetCameraAfterTP;
+		BOOL mOffsetTPByUserHeight;
+	BOOL mPreviewAnimInWorld;
+	BOOL mSaveScriptsAsMono;
+	BOOL mAlwaysRezInGroup;
+	//Disable Teleport Progress
+	//Disable Logout progress
+	//always show Build
+	BOOL mAlwaysShowFly;
+	//Disable camera minimum distance
+	BOOL mPowerUser;
+	BOOL mUseSystemFolder;
+	BOOL mUploadToSystem;
+	//Chat/IM -----------------------------------------------------------------------------
+	BOOL mHideNotificationsInChat;
+	BOOL mPlayTypingSound;
+	BOOL mHideTypingNotification;
+	BOOL mEnableMUPose;
+	BOOL mEnableOOCAutoClose;
+	U32 mLinksForChattingObjects;
+	U32 mTimeFormat;
+	U32 mDateFormat;
+	BOOL mSecondsInChatAndIMs;
+	//Performance -------------------------------------------------------------------------
+	BOOL mFetchInventoryOnLogin;
+	BOOL mEnableLLWind;
+	BOOL mEnableClouds;
+	BOOL mEnableClassicClouds;
+	BOOL mSpeedRez;
+	U32 mSpeedRezInterval;
+	//Command Line ------------------------------------------------------------------------
+	//Privacy -----------------------------------------------------------------------------
+	BOOL mBroadcastViewerEffects;
+	BOOL mDisablePointAtAndBeam;
+	BOOL mPrivateLookAt;
+	BOOL mShowLookAt;
+	BOOL mRevokePermsOnStandUp;
+	BOOL mDisableClickSit;
+	//Text Options ------------------------------------------------------------------------
+    BOOL mSpellDisplay;
 };

 #endif
--- a/indra/newview/lggdicdownload.cpp
+++ b/indra/newview/lggdicdownload.cpp
@@ -0,0 +1,195 @@
+/* Copyright (c) 2009
+*
+* Greg Hendrickson (LordGregGreg Back). All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or
+* without modification, are permitted provided that the following
+* conditions are met:
+*
+*   1. Redistributions of source code must retain the above copyright
+*      notice, this list of conditions and the following disclaimer.
+*   2. Redistributions in binary form must reproduce the above
+*      copyright notice, this list of conditions and the following
+*      disclaimer in the documentation and/or other materials provided
+*      with the distribution.
+*   3. Neither the name Modular Systems nor the names of its contributors
+*      may be used to endorse or promote products derived from this
+*      software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "lggdicdownload.h"
+
+#include "llagentdata.h"
+#include "llcommandhandler.h"
+#include "llfloater.h"
+#include "lluictrlfactory.h"
+#include "llagent.h"
+#include "llpanel.h"
+#include "llbutton.h"
+#include "llcolorswatch.h"
+#include "llcombobox.h"
+#include "llview.h"
+#include "ascentprefssys.h"
+#include "llviewercontrol.h"
+#include "llhttpclient.h"
+#include "llbufferstream.h"
+
+class lggDicDownloadFloater;
+
+class EmeraldDicDownloader : public LLHTTPClient::Responder
+{
+public:
+	EmeraldDicDownloader(lggDicDownloadFloater* spanel, std::string sname);
+	~EmeraldDicDownloader() { }
+	void completedRaw(
+		U32 status,
+		const std::string& reason,
+		const LLChannelDescriptors& channels,
+		const LLIOPipe::buffer_ptr_t& buffer);
+private:
+	lggDicDownloadFloater* panel;
+	std::string name;
+};
+
+
+class lggDicDownloadFloater : public LLFloater, public LLFloaterSingleton<lggDicDownloadFloater>
+{
+public:
+	lggDicDownloadFloater(const LLSD& seed);
+	virtual ~lggDicDownloadFloater();
+	BOOL postBuild(void);
+	void setData(std::vector<std::string> shortNames, std::vector<std::string> longNames, void * data);
+	static void onClickDownload(void* data);
+	std::vector<std::string> sNames;
+	std::vector<std::string> lNames;
+	LLPrefsAscentSys * empanel;
+};
+
+lggDicDownloadFloater::~lggDicDownloadFloater()
+{
+}
+
+lggDicDownloadFloater::lggDicDownloadFloater(const LLSD& seed)
+{
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_dictionaries.xml");
+
+	if (getRect().mLeft == 0 
+		&& getRect().mBottom == 0)
+	{
+		center();
+	}
+}
+
+BOOL lggDicDownloadFloater::postBuild(void)
+{
+	childSetAction("Emerald_dic_download", onClickDownload, this);
+	return true;
+}
+
+void lggDicDownloadFloater::setData(std::vector<std::string> shortNames, std::vector<std::string> longNames, void* data)
+{
+	sNames = shortNames;
+	lNames = longNames;
+	empanel = (LLPrefsAscentSys*)data;
+
+	LLComboBox* comboBox = getChild<LLComboBox>("Emerald_combo_dics");
+	if (comboBox != NULL) 
+	{
+		comboBox->removeall();
+		for (int i = 0; i < (int)lNames.size(); 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)
+	{
+		//std::string selection = self->childGetValue("Emerald_combo_dics").asString();
+		LLComboBox* comboBox = self->getChild<LLComboBox>("Emerald_combo_dics");
+		if (comboBox != NULL) 
+		{
+			if (!comboBox->getSelectedItemLabel().empty())
+			{
+				std::string newDict(self->sNames[comboBox->getCurrentIndex()]);
+				LLHTTPClient::get(gSavedSettings.getString("SpellDownloadURL")+newDict+".aff", new EmeraldDicDownloader(self,newDict+".aff"));
+				LLHTTPClient::get(gSavedSettings.getString("SpellDownloadURL")+newDict+".dic", new EmeraldDicDownloader(NULL,newDict+".dic"));
+				
+				LLButton* button = self->getChild<LLButton>("Emerald_dic_download");
+				if (button)
+				{
+					// 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)
+	{
+		lggDicDownloadFloater* dic_floater = lggDicDownloadFloater::showInstance();
+		dic_floater->setData(shortNames,longNames,data);
+	}
+}
+
+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)
+	{
+		return;
+	}
+	LLBufferStream istr(channels, buffer.get());
+	std::string dicpath(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", name.c_str()));
+
+	llofstream ostr(dicpath, std::ios::binary);
+
+	while (istr.good() && ostr.good())
+	{
+		ostr << istr.rdbuf();
+	}
+	ostr.close();
+	if (panel)
+	{
+        if (panel->empanel)
+        {
+    		panel->empanel->refresh();
+        }
+        else
+        {
+            llinfos << "completedRaw(): No empanel to refresh()!" << llendl;
+        }
+
+		panel->close();
+	}
+}
--- a/indra/newview/lggdicdownload.h
+++ b/indra/newview/lggdicdownload.h
@@ -0,0 +1,37 @@
+/* Copyright (c) 2009
+*
+* Greg Hendrickson (LordGregGreg Back). All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or
+* without modification, are permitted provided that the following
+* conditions are met:
+*
+*   1. Redistributions of source code must retain the above copyright
+*      notice, this list of conditions and the following disclaimer.
+*   2. Redistributions in binary form must reproduce the above
+*      copyright notice, this list of conditions and the following
+*      disclaimer in the documentation and/or other materials provided
+*      with the distribution.
+*   3. Neither the name Modular Systems nor the names of its contributors
+*      may be used to endorse or promote products derived from this
+*      software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class LggDicDownload
+{
+	public:
+	static void show( BOOL showw , std::vector<std::string> shortNames, std::vector<std::string> longNames, void * data);
+};
+
--- a/indra/newview/lgghunspell_wrapper.cpp
+++ b/indra/newview/lgghunspell_wrapper.cpp
@@ -0,0 +1,974 @@
+/* Copyright (C) 2009 LordGregGreg Back
+
+   This is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+ 
+   This is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+ 
+   You should have received a copy of the GNU Lesser General Public
+   License along with the viewer; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+#include "llviewerprecompiledheaders.h"
+#include "lgghunspell_wrapper.h"
+#include <boost/regex.hpp>
+#include "llweb.h"
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
+#include "llfile.h"
+#include "llhttpclient.h"
+#include "lggdicdownload.h"
+
+lggHunSpell_Wrapper *glggHunSpell = 0;
+Hunspell* lggHunSpell_Wrapper::myHunspell = 0;
+// do not insert empty lines after this line until the size calculation
+#define COUNTRY_CODES_RAW_START_LINE (__LINE__ + 2)
+static char * countryCodesraw[] = {
+  (char*)"SL",(char*)"SecondLife",
+  (char*)"AD",(char*)"Andorra",
+  (char*)"AE",(char*)"United Arab Emirates",
+  (char*)"AF",(char*)"Afghanistan",
+  (char*)"AG",(char*)"Antigua & Barbuda",
+  (char*)"AI",(char*)"Anguilla",
+  (char*)"AL",(char*)"Albania",
+  (char*)"AM",(char*)"Armenia",
+  (char*)"AN",(char*)"Netherlands Antilles",
+  (char*)"AO",(char*)"Angola",
+  (char*)"AQ",(char*)"Antarctica",
+  (char*)"AR",(char*)"Argentina",
+  (char*)"AS",(char*)"American Samoa",
+  (char*)"AT",(char*)"Austria",
+  (char*)"AU",(char*)"Australia",
+  (char*)"AW",(char*)"Aruba",
+  (char*)"AZ",(char*)"Azerbaijan",
+  (char*)"BA",(char*)"Bosnia and Herzegovina",
+  (char*)"BB",(char*)"Barbados",
+  (char*)"BD",(char*)"Bangladesh",
+  (char*)"BE",(char*)"Belgium",
+  (char*)"BF",(char*)"Burkina Faso",
+  (char*)"BG",(char*)"Bulgaria",
+  (char*)"BH",(char*)"Bahrain",
+  (char*)"BI",(char*)"Burundi",
+  (char*)"BJ",(char*)"Benin",
+  (char*)"BM",(char*)"Bermuda",
+  (char*)"BN",(char*)"Brunei Darussalam",
+  (char*)"BO",(char*)"Bolivia",
+  (char*)"BR",(char*)"Brazil",
+  (char*)"BS",(char*)"Bahama",
+  (char*)"BT",(char*)"Bhutan",
+  (char*)"BU",(char*)"Burma",
+  (char*)"BV",(char*)"Bouvet Island",
+  (char*)"BW",(char*)"Botswana",
+  (char*)"BY",(char*)"Belarus",
+  (char*)"BZ",(char*)"Belize",
+  (char*)"CA",(char*)"Canada",
+  (char*)"CC",(char*)"Cocos (Keeling) Islands",
+  (char*)"CF",(char*)"Central African Republic",
+  (char*)"CG",(char*)"Congo",
+  (char*)"CH",(char*)"Switzerland",
+  (char*)"CI",(char*)"Côte D'ivoire (Ivory Coast)",
+  (char*)"CK",(char*)"Cook Iislands",
+  (char*)"CL",(char*)"Chile",
+  (char*)"CM",(char*)"Cameroon",
+  (char*)"CN",(char*)"China",
+  (char*)"CO",(char*)"Colombia",
+  (char*)"CR",(char*)"Costa Rica",
+  (char*)"CS",(char*)"Czechoslovakia",
+  (char*)"CU",(char*)"Cuba",
+  (char*)"CV",(char*)"Cape Verde",
+  (char*)"CX",(char*)"Christmas Island",
+  (char*)"CY",(char*)"Cyprus",
+  (char*)"CZ",(char*)"Czech Republic",
+  (char*)"DD",(char*)"German Democratic Republic",
+  (char*)"DE",(char*)"Germany",
+  (char*)"DJ",(char*)"Djibouti",
+  (char*)"DK",(char*)"Denmark",
+  (char*)"DM",(char*)"Dominica",
+  (char*)"DO",(char*)"Dominican Republic",
+  (char*)"DZ",(char*)"Algeria",
+  (char*)"EC",(char*)"Ecuador",
+  (char*)"EE",(char*)"Estonia",
+  (char*)"EG",(char*)"Egypt",
+  (char*)"EH",(char*)"Western Sahara",
+  (char*)"ER",(char*)"Eritrea",
+  (char*)"ES",(char*)"Spain",
+  (char*)"ET",(char*)"Ethiopia",
+  (char*)"FI",(char*)"Finland",
+  (char*)"FJ",(char*)"Fiji",
+  (char*)"FK",(char*)"Falkland Islands (Malvinas)",
+  (char*)"FM",(char*)"Micronesia",
+  (char*)"FO",(char*)"Faroe Islands",
+  (char*)"FR",(char*)"France",
+  (char*)"FX",(char*)"France, Metropolitan",
+  (char*)"GA",(char*)"Gabon",
+  (char*)"GB",(char*)"United Kingdom (Great Britain)",
+  (char*)"GD",(char*)"Grenada",
+  (char*)"GE",(char*)"Georgia",
+  (char*)"GF",(char*)"French Guiana",
+  (char*)"GH",(char*)"Ghana",
+  (char*)"GI",(char*)"Gibraltar",
+  (char*)"GL",(char*)"Greenland",
+  (char*)"GM",(char*)"Gambia",
+  (char*)"GN",(char*)"Guinea",
+  (char*)"GP",(char*)"Guadeloupe",
+  (char*)"GQ",(char*)"Equatorial Guinea",
+  (char*)"GR",(char*)"Greece",
+  (char*)"GS",(char*)"South Georgia and the South Sandwich Islands",
+  (char*)"GT",(char*)"Guatemala",
+  (char*)"GU",(char*)"Guam",
+  (char*)"GW",(char*)"Guinea-Bissau",
+  (char*)"GY",(char*)"Guyana",
+  (char*)"HK",(char*)"Hong Kong",
+  (char*)"HM",(char*)"Heard & McDonald Islands",
+  (char*)"HN",(char*)"Honduras",
+  (char*)"HR",(char*)"Croatia",
+  (char*)"HT",(char*)"Haiti",
+  (char*)"HU",(char*)"Hungary",
+  (char*)"ID",(char*)"Indonesia",
+  (char*)"IE",(char*)"Ireland",
+  (char*)"IL",(char*)"Israel",
+  (char*)"IN",(char*)"India",
+  (char*)"IO",(char*)"British Indian Ocean Territory",
+  (char*)"IQ",(char*)"Iraq",
+  (char*)"IR",(char*)"Islamic Republic of Iran",
+  (char*)"IS",(char*)"Iceland",
+  (char*)"IT",(char*)"Italy",
+  (char*)"JM",(char*)"Jamaica",
+  (char*)"JO",(char*)"Jordan",
+  (char*)"JP",(char*)"Japan",
+  (char*)"KE",(char*)"Kenya",
+  (char*)"KG",(char*)"Kyrgyzstan",
+  (char*)"KH",(char*)"Cambodia",
+  (char*)"KI",(char*)"Kiribati",
+  (char*)"KM",(char*)"Comoros",
+  (char*)"KN",(char*)"St. Kitts and Nevis",
+  (char*)"KP",(char*)"Korea, Democratic People's Republic of",
+  (char*)"KR",(char*)"Korea, Republic of",
+  (char*)"KW",(char*)"Kuwait",
+  (char*)"KY",(char*)"Cayman Islands",
+  (char*)"KZ",(char*)"Kazakhstan",
+  (char*)"LA",(char*)"Lao People's Democratic Republic",
+  (char*)"LB",(char*)"Lebanon",
+  (char*)"LC",(char*)"Saint Lucia",
+  (char*)"LI",(char*)"Liechtenstein",
+  (char*)"LK",(char*)"Sri Lanka",
+  (char*)"LR",(char*)"Liberia",
+  (char*)"LS",(char*)"Lesotho",
+  (char*)"LT",(char*)"Lithuania",
+  (char*)"LU",(char*)"Luxembourg",
+  (char*)"LV",(char*)"Latvia",
+  (char*)"LY",(char*)"Libyan Arab Jamahiriya",
+  (char*)"MA",(char*)"Morocco",
+  (char*)"MC",(char*)"Monaco",
+  (char*)"MD",(char*)"Moldova, Republic of",
+  (char*)"MG",(char*)"Madagascar",
+  (char*)"MH",(char*)"Marshall Islands",
+  (char*)"ML",(char*)"Mali",
+  (char*)"MN",(char*)"Mongolia",
+  (char*)"MM",(char*)"Myanmar",
+  (char*)"MO",(char*)"Macau",
+  (char*)"MP",(char*)"Northern Mariana Islands",
+  (char*)"MQ",(char*)"Martinique",
+  (char*)"MR",(char*)"Mauritania",
+  (char*)"MS",(char*)"Monserrat",
+  (char*)"MT",(char*)"Malta",
+  (char*)"MU",(char*)"Mauritius",
+  (char*)"MV",(char*)"Maldives",
+  (char*)"MW",(char*)"Malawi",
+  (char*)"MX",(char*)"Mexico",
+  (char*)"MY",(char*)"Malaysia",
+  (char*)"MZ",(char*)"Mozambique",
+  (char*)"NA",(char*)"Namibia",
+  (char*)"NC",(char*)"New Caledonia",
+  (char*)"NE",(char*)"Niger",
+  (char*)"NF",(char*)"Norfolk Island",
+  (char*)"NG",(char*)"Nigeria",
+  (char*)"NI",(char*)"Nicaragua",
+  (char*)"NL",(char*)"Netherlands",
+  (char*)"NO",(char*)"Norway",
+  (char*)"NP",(char*)"Nepal",
+  (char*)"NR",(char*)"Nauru",
+  (char*)"NT",(char*)"Neutral Zone",
+  (char*)"NU",(char*)"Niue",
+  (char*)"NZ",(char*)"New Zealand",
+  (char*)"OM",(char*)"Oman",
+  (char*)"PA",(char*)"Panama",
+  (char*)"PE",(char*)"Peru",
+  (char*)"PF",(char*)"French Polynesia",
+  (char*)"PG",(char*)"Papua New Guinea",
+  (char*)"PH",(char*)"Philippines",
+  (char*)"PK",(char*)"Pakistan",
+  (char*)"PL",(char*)"Poland",
+  (char*)"PM",(char*)"St. Pierre & Miquelon",
+  (char*)"PN",(char*)"Pitcairn",
+  (char*)"PR",(char*)"Puerto Rico",
+  (char*)"PT",(char*)"Portugal",
+  (char*)"PW",(char*)"Palau",
+  (char*)"PY",(char*)"Paraguay",
+  (char*)"QA",(char*)"Qatar",
+  (char*)"RE",(char*)"Réunion",
+  (char*)"RO",(char*)"Romania",
+  (char*)"RU",(char*)"Russian Federation",
+  (char*)"RW",(char*)"Rwanda",
+  (char*)"SA",(char*)"Saudi Arabia",
+  (char*)"SB",(char*)"Solomon Islands",
+  (char*)"SC",(char*)"Seychelles",
+  (char*)"SD",(char*)"Sudan",
+  (char*)"SE",(char*)"Sweden",
+  (char*)"SG",(char*)"Singapore",
+  (char*)"SH",(char*)"St. Helena",
+  (char*)"SI",(char*)"Slovenia",
+  (char*)"SJ",(char*)"Svalbard & Jan Mayen Islands",
+  (char*)"SK",(char*)"Slovakia",
+  (char*)"SL",(char*)"Sierra Leone",
+  (char*)"SM",(char*)"San Marino",
+  (char*)"SN",(char*)"Senegal",
+  (char*)"SO",(char*)"Somalia",
+  (char*)"SR",(char*)"Suriname",
+  (char*)"ST",(char*)"Sao Tome & Principe",
+  (char*)"SU",(char*)"Union of Soviet Socialist Republics",
+  (char*)"SV",(char*)"El Salvador",
+  (char*)"SY",(char*)"Syrian Arab Republic",
+  (char*)"SZ",(char*)"Swaziland",
+  (char*)"TC",(char*)"Turks & Caicos Islands",
+  (char*)"TD",(char*)"Chad",
+  (char*)"TF",(char*)"French Southern Territories",
+  (char*)"TG",(char*)"Togo",
+  (char*)"TH",(char*)"Thailand",
+  (char*)"TJ",(char*)"Tajikistan",
+  (char*)"TK",(char*)"Tokelau",
+  (char*)"TM",(char*)"Turkmenistan",
+  (char*)"TN",(char*)"Tunisia",
+  (char*)"TO",(char*)"Tonga",
+  (char*)"TP",(char*)"East Timor",
+  (char*)"TR",(char*)"Turkey",
+  (char*)"TT",(char*)"Trinidad & Tobago",
+  (char*)"TV",(char*)"Tuvalu",
+  (char*)"TW",(char*)"Taiwan, Province of China",
+  (char*)"TZ",(char*)"Tanzania, United Republic of",
+  (char*)"UA",(char*)"Ukraine",
+  (char*)"UG",(char*)"Uganda",
+  (char*)"UM",(char*)"United States Minor Outlying Islands",
+  (char*)"US",(char*)"United States of America",
+  (char*)"UY",(char*)"Uruguay",
+  (char*)"UZ",(char*)"Uzbekistan",
+  (char*)"VA",(char*)"Vatican City State",
+  (char*)"VC",(char*)"St. Vincent & the Grenadines",
+  (char*)"VE",(char*)"Venezuela",
+  (char*)"VG",(char*)"British Virgin Islands",
+  (char*)"VI",(char*)"United States Virgin Islands",
+  (char*)"VN",(char*)"Viet Nam",
+  (char*)"VU",(char*)"Vanuatu",
+  (char*)"WF",(char*)"Wallis & Futuna Islands",
+  (char*)"WS",(char*)"Samoa",
+  (char*)"YD",(char*)"Democratic Yemen",
+  (char*)"YE",(char*)"Yemen",
+  (char*)"YT",(char*)"Mayotte",
+  (char*)"YU",(char*)"Yugoslavia",
+  (char*)"ZA",(char*)"South Africa",
+  (char*)"ZM",(char*)"Zambia",
+  (char*)"ZR",(char*)"Zaire",
+  (char*)"ZW",(char*)"Zimbabwe",
+  (char*)"ZZ",(char*)"Unknown or unspecified country"
+};
+//#define COUNTRY_CODES_RAW_SIZE ((__LINE__ - 1 - COUNTRY_CODES_RAW_START_LINE) * 2)
+#define COUNTRY_CODES_RAW_SIZE 492
+#define LANGUAGE_CODES_RAW_START_LINE (__LINE__ + 2)
+static char * languageCodesraw[]={
+  (char*)"aa",(char*)"Afar",
+  (char*)"ab",(char*)"Abkhazian",
+  (char*)"ae",(char*)"Avestan",
+  (char*)"af",(char*)"Afrikaans",
+  (char*)"ak",(char*)"Akan",
+  (char*)"am",(char*)"Amharic",
+  (char*)"an",(char*)"Aragonese",
+  (char*)"ar",(char*)"Arabic",
+  (char*)"as",(char*)"Assamese",
+  (char*)"av",(char*)"Avaric",
+  (char*)"ay",(char*)"Aymara",
+  (char*)"az",(char*)"Azerbaijani",
+  (char*)"ba",(char*)"Bashkir",
+  (char*)"be",(char*)"Belarusian",
+  (char*)"bg",(char*)"Bulgarian",
+  (char*)"bh",(char*)"Bihari",
+  (char*)"bi",(char*)"Bislama",
+  (char*)"bm",(char*)"Bambara",
+  (char*)"bn",(char*)"Bengali",
+  (char*)"bo",(char*)"Tibetan",
+  (char*)"br",(char*)"Breton",
+  (char*)"bs",(char*)"Bosnian",
+  (char*)"ca",(char*)"Catalan",
+  (char*)"ce",(char*)"Chechen",
+  (char*)"ch",(char*)"Chamorro",
+  (char*)"co",(char*)"Corsican",
+  (char*)"cr",(char*)"Cree",
+  (char*)"cs",(char*)"Czech",
+  (char*)"cu",(char*)"ChurchSlavic",
+  (char*)"cv",(char*)"Chuvash",
+  (char*)"cy",(char*)"Welsh",
+  (char*)"da",(char*)"Danish",
+  (char*)"de",(char*)"German",
+  (char*)"dv",(char*)"Divehi",
+  (char*)"dz",(char*)"Dzongkha",
+  (char*)"ee",(char*)"Ewe",
+  (char*)"el",(char*)"ModernGreek",
+  (char*)"en",(char*)"English",
+  (char*)"eo",(char*)"Esperanto",
+  (char*)"es",(char*)"Spanish",
+  (char*)"et",(char*)"Estonian",
+  (char*)"eu",(char*)"Basque",
+  (char*)"fa",(char*)"Persian",
+  (char*)"ff",(char*)"Fulah",
+  (char*)"fi",(char*)"Finnish",
+  (char*)"fj",(char*)"Fijian",
+  (char*)"fo",(char*)"Faroese",
+  (char*)"fr",(char*)"French",
+  (char*)"fy",(char*)"WesternFrisian",
+  (char*)"ga",(char*)"Irish",
+  (char*)"gd",(char*)"Gaelic",
+  (char*)"gl",(char*)"Galician",
+  (char*)"gn",(char*)"Guaraní",
+  (char*)"gu",(char*)"Gujarati",
+  (char*)"gv",(char*)"Manx",
+  (char*)"ha",(char*)"Hausa",
+  (char*)"he",(char*)"ModernHebrew",
+  (char*)"hi",(char*)"Hindi",
+  (char*)"ho",(char*)"HiriMotu",
+  (char*)"hr",(char*)"Croatian",
+  (char*)"ht",(char*)"Haitian",
+  (char*)"hu",(char*)"Hungarian",
+  (char*)"hy",(char*)"Armenian",
+  (char*)"hz",(char*)"Herero",
+  (char*)"ia",(char*)"Interlingua",
+  (char*)"id",(char*)"Indonesian",
+  (char*)"ie",(char*)"Interlingue",
+  (char*)"ig",(char*)"Igbo",
+  (char*)"ii",(char*)"SichuanYi",
+  (char*)"ik",(char*)"Inupiaq",
+  (char*)"io",(char*)"Ido",
+  (char*)"is",(char*)"Icelandic",
+  (char*)"it",(char*)"Italian",
+  (char*)"iu",(char*)"Inuktitut",
+  (char*)"ja",(char*)"Japanese",
+  (char*)"jv",(char*)"Javanese",
+  (char*)"ka",(char*)"Georgian",
+  (char*)"kg",(char*)"Kongo",
+  (char*)"ki",(char*)"Kikuyu",
+  (char*)"kj",(char*)"Kwanyama",
+  (char*)"kk",(char*)"Kazakh",
+  (char*)"kl",(char*)"Kalaallisut",
+  (char*)"km",(char*)"CentralKhmer",
+  (char*)"kn",(char*)"Kannada",
+  (char*)"ko",(char*)"Korean",
+  (char*)"kr",(char*)"Kanuri",
+  (char*)"ks",(char*)"Kashmiri",
+  (char*)"ku",(char*)"Kurdish",
+  (char*)"kv",(char*)"Komi",
+  (char*)"kw",(char*)"Cornish",
+  (char*)"ky",(char*)"Kirghiz",
+  (char*)"la",(char*)"Latin",
+  (char*)"lb",(char*)"Luxembourgish",
+  (char*)"lg",(char*)"Ganda",
+  (char*)"li",(char*)"Limburgish",
+  (char*)"ln",(char*)"Lingala",
+  (char*)"lo",(char*)"Lao",
+  (char*)"lt",(char*)"Lithuanian",
+  (char*)"lu",(char*)"Luba-Katanga",
+  (char*)"lv",(char*)"Latvian",
+  (char*)"mg",(char*)"Malagasy",
+  (char*)"mh",(char*)"Marshallese",
+  (char*)"mi",(char*)"Maori",
+  (char*)"mk",(char*)"Macedonian",
+  (char*)"ml",(char*)"Malayalam",
+  (char*)"mn",(char*)"Mongolian",
+  (char*)"mr",(char*)"Marathi",
+  (char*)"ms",(char*)"Malay",
+  (char*)"mt",(char*)"Maltese",
+  (char*)"my",(char*)"Burmese",
+  (char*)"na",(char*)"Nauru",
+  (char*)"nb",(char*)"NorwegianBokmal",
+  (char*)"nd",(char*)"NorthNdebele",
+  (char*)"ne",(char*)"Nepali",
+  (char*)"ng",(char*)"Ndonga",
+  (char*)"nl",(char*)"Dutch/Flemish",
+  (char*)"nn",(char*)"NorwegianNynorsk",
+  (char*)"no",(char*)"Norwegian",
+  (char*)"nr",(char*)"SouthNdebele",
+  (char*)"nv",(char*)"Navajo/Navaho",
+  (char*)"ny",(char*)"Nyanja",
+  (char*)"oc",(char*)"Occitan",
+  (char*)"oj",(char*)"Ojibwa",
+  (char*)"om",(char*)"Oromo",
+  (char*)"or",(char*)"Oriya",
+  (char*)"os",(char*)"Ossetian",
+  (char*)"pa",(char*)"Panjabi",
+  (char*)"pi",(char*)"Pali",
+  (char*)"pl",(char*)"Polish",
+  (char*)"ps",(char*)"Pashto/Pushto",
+  (char*)"pt",(char*)"Portuguese",
+  (char*)"qu",(char*)"Quechua",
+  (char*)"rm",(char*)"Romansh",
+  (char*)"rn",(char*)"Rundi",
+  (char*)"ro",(char*)"Romanian",
+  (char*)"ru",(char*)"Russian",
+  (char*)"rw",(char*)"Kinyarwanda",
+  (char*)"sa",(char*)"Sanskrit",
+  (char*)"sc",(char*)"Sardinian",
+  (char*)"sd",(char*)"Sindhi",
+  (char*)"se",(char*)"NorthernSami",
+  (char*)"sg",(char*)"Sango",
+  (char*)"si",(char*)"Sinhala",
+  (char*)"sk",(char*)"Slovak",
+  (char*)"sl",(char*)"Slovene",
+  (char*)"sm",(char*)"Samoan",
+  (char*)"sn",(char*)"Shona",
+  (char*)"so",(char*)"Somali",
+  (char*)"sq",(char*)"Albanian",
+  (char*)"sr",(char*)"Serbian",
+  (char*)"ss",(char*)"Swati",
+  (char*)"st",(char*)"SouthernSotho",
+  (char*)"su",(char*)"Sundanese",
+  (char*)"sv",(char*)"Swedish",
+  (char*)"sw",(char*)"Swahili",
+  (char*)"ta",(char*)"Tamil",
+  (char*)"te",(char*)"Telugu",
+  (char*)"tg",(char*)"Tajik",
+  (char*)"th",(char*)"Thai",
+  (char*)"ti",(char*)"Tigrinya",
+  (char*)"tk",(char*)"Turkmen",
+  (char*)"tl",(char*)"Tagalog",
+  (char*)"tn",(char*)"Tswana",
+  (char*)"to",(char*)"Tonga",
+  (char*)"tr",(char*)"Turkish",
+  (char*)"ts",(char*)"Tsonga",
+  (char*)"tt",(char*)"Tatar",
+  (char*)"tw",(char*)"Twi",
+  (char*)"ty",(char*)"Tahitian",
+  (char*)"ug",(char*)"Uighur",
+  (char*)"uk",(char*)"Ukrainian",
+  (char*)"ur",(char*)"Urdu",
+  (char*)"uz",(char*)"Uzbek",
+  (char*)"ve",(char*)"Venda",
+  (char*)"vi",(char*)"Vietnamese",
+  (char*)"vo",(char*)"Volapük",
+  (char*)"wa",(char*)"Walloon",
+  (char*)"wo",(char*)"Wolof",
+  (char*)"xh",(char*)"Xhosa",
+  (char*)"yi",(char*)"Yiddish",
+  (char*)"yo",(char*)"Yoruba",
+  (char*)"za",(char*)"Zhuang",
+  (char*)"zh",(char*)"Chinese",
+  (char*)"zu",(char*)"Zulu"
+};
+//#define LANGUAGE_CODES_RAW_SIZE ((__LINE__ - 1 - LANGUAGE_CODES_RAW_START_LINE) * 2)
+#define LANGUAGE_CODES_RAW_SIZE 368
+
+lggHunSpell_Wrapper::lggHunSpell_Wrapper()
+{
+	//languageCodes(begin(languageCodesraw), end(languageCodesraw));    
+//	mSpellCheckHighlight = rebind_llcontrol<BOOL>("SpellDisplay", &gSavedSettings, true);
+}
+
+lggHunSpell_Wrapper::~lggHunSpell_Wrapper()
+{
+}
+
+BOOL lggHunSpell_Wrapper::getSpellCheckHighlight()
+{
+	static const LLCachedControl<bool> mSpellCheckHighlight("SpellDisplay", false);
+
+    return mSpellCheckHighlight;
+}
+
+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))
+	{
+		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;
+	
+	//expecting a full name comming in
+	newDict = fullName2DictName(newDict);
+
+	if (myHunspell)
+	{
+		delete myHunspell;
+	}
+
+	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());
+	llinfos << "Adding custom dictionary " << llendl;
+	createCustomDic();
+	addDictionary("custom");
+	std::vector<std::string> toInstall = getInstalledDicts();
+	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))
+	{
+		llofstream export_file;	
+		export_file.open(filename);
+		std::string sizePart("1\nLordGregGreg\n");
+		export_file.write(sizePart.c_str(),sizePart.length());
+		export_file.close();
+	}
+}
+
+void lggHunSpell_Wrapper::addWordToCustomDictionary(std::string wordToAdd)
+{
+	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))
+	{
+		//get words already there..
+		llifstream importer(filename);
+		std::string line;
+		if (getline( importer, line ))//ignored the size
+		{
+			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++)
+	{
+		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());
+	//export_file << std::hex << 10 ;
+	export_file.close();
+}
+
+BOOL lggHunSpell_Wrapper::isSpelledRight(std::string wordToCheck)
+{
+	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;	
+	int numberOfSuggestions = myHunspell->suggest(&suggestionList, badWord.c_str());	
+	if (numberOfSuggestions <= 0)
+	{
+		return toReturn;
+	}
+	for (int i = 0; i < numberOfSuggestions; i++) 
+	{
+		std::string tempSugg(suggestionList[i]);
+		toReturn.push_back(tempSugg);
+	}
+	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))
+	{
+		llinfos << testWord.c_str() << " is spelled correctly" << llendl;
+	}
+	else
+	{
+		llinfos << testWord.c_str() << " is not spelled correctly, getting suggestions" << llendl;
+		std::vector<std::string> suggList;
+		suggList.clear();
+		suggList = getSuggestionList(testWord);
+		llinfos << "Got suggestions.. " << llendl;
+
+		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("SpellBase"));
+}
+
+void lggHunSpell_Wrapper::addDictionary(std::string additionalDictionary)
+{
+	if (!myHunspell || additionalDictionary.empty())
+	{
+		return;
+	}
+
+	//expecting a full name here
+	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.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)
+	{
+		breakPoint = dictName.find("_");
+	}
+	if (breakPoint == std::string::npos)
+	{
+		//no country code given
+		languageCode = dictName;
+	}
+	else
+	{
+		languageCode = dictName.substr(0,breakPoint);
+		countryCode = dictName.substr(breakPoint+1);
+	}
+
+	//get long language code
+	for (int i = 0; i<LANGUAGE_CODES_RAW_SIZE; i++)
+	{		
+		if (0 == LLStringUtil::compareInsensitive(languageCode, std::string(languageCodesraw[i])))
+		{
+			languageCode = languageCodesraw[i+1];
+			break;
+		}
+	}
+
+	//get long country code
+	if (!countryCode.empty())
+	{
+		for (int i =0; i<COUNTRY_CODES_RAW_SIZE; i++)
+		{		
+			//llinfos << i << llendl;
+			if (0 == LLStringUtil::compareInsensitive(countryCode, std::string(countryCodesraw[i])))
+			{
+				countryCode = countryCodesraw[i+1];
+				break;
+			}
+		}
+		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)
+	{
+		languageCode = fullName;
+	}
+	else
+	{
+		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)
+	{
+		//llinfos << i << llendl;
+		if (0 == LLStringUtil::compareInsensitive(languageCode, std::string(languageCodesraw[i])))
+		{
+			languageCode = std::string(languageCodesraw[i-1]);
+			break;
+		}
+	}
+	//get long country code
+	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])))
+			{
+				countryCode = std::string(countryCodesraw[i-1]);
+				break;
+			}
+		}
+		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) 
+	{
+		std::string name;
+		found = gDirUtilp->getNextFileInDir(path_name, "*.aff", name, false);
+		if (found)
+		{
+			names.push_back(dictName2FullName(name));
+		}
+	}
+	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)
+		{
+			names.push_back(dictName2FullName(name));
+		}
+	}
+
+	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) 
+	{
+		std::string name;
+		found = gDirUtilp->getNextFileInDir(path_name, "*.dic", name, false);
+		if (found)
+		{
+			names.push_back(dictName2FullName(name));
+		}
+	}
+	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)
+		{
+			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("SpellInstalled"));
+	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++)
+	{
+		bool found = false;
+		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))
+		{
+			found = true;
+		}
+		if (0 == LLStringUtil::compareInsensitive(dics[i], "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)
+	{
+		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] + ",";
+	}
+	return toReturn.erase(toReturn.length()-1);
+}
+
+void lggHunSpell_Wrapper::addButton(std::string selection)
+{
+	if (selection.empty())
+	{
+		return;
+	}
+	addDictionary(selection);
+	std::vector<std::string> alreadyInstalled = CSV2VEC(gSavedSettings.getString("SpellInstalled"));
+	alreadyInstalled.push_back(fullName2DictName(selection));	
+	gSavedSettings.setString("SpellInstalled", VEC2CSV(alreadyInstalled));
+}
+
+void lggHunSpell_Wrapper::removeButton(std::string selection)
+{
+	if (selection.empty())
+	{
+		return;
+	}
+	std::vector<std::string> newInstalledDics;
+	std::vector<std::string> currentlyInstalled = getInstalledDicts();
+	for (int i = 0; i < (int)currentlyInstalled.size(); i++)
+	{
+		if (0 != LLStringUtil::compareInsensitive(selection, currentlyInstalled[i]))
+		{
+			newInstalledDics.push_back(fullName2DictName(currentlyInstalled[i]));
+		}
+	}
+	gSavedSettings.setString("SpellInstalled", VEC2CSV(newInstalledDics));
+	processSettings();
+}
+
+void lggHunSpell_Wrapper::newDictSelection(std::string selection)
+{
+	currentBaseDic = selection;
+	gSavedSettings.setString("SpellBase", 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("SpellInstalled", "en_sl");
+	processSettings();
+}
+
+void lggHunSpell_Wrapper::getMoreButton(void* data)
+{
+	std::vector<std::string> shortNames;
+	std::vector<std::string> longNames;
+	LLSD response = LLHTTPClient::blockingGet(gSavedSettings.getString("SpellDownloadURL")+"dic_list.xml");
+	if (response.has("body"))
+	{
+		const LLSD &dict_list = response["body"];
+		if (dict_list.has("isComplete"))
+		{
+			LLSD dics = dict_list["data"];
+			for (int i = 0; i < dics.size(); i++)
+			{
+				std::string dicFullName = dictName2FullName(dics[i].asString());
+				longNames.push_back(dicFullName);
+				shortNames.push_back(fullName2DictName(dicFullName));
+			}
+			LggDicDownload::show(true,shortNames,longNames, 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))
+	{
+			createCustomDic();
+			//glggHunSpell->addWordToCustomDictionary("temp");
+	}
+	
+	gViewerWindow->getWindow()->ShellEx(dicdicpath);
+}
+
+void lggHunSpell_Wrapper::setSpellCheckHighlight(BOOL highlight)
+{
+	gSavedSettings.setBOOL("SpellDisplay", highlight);
+}
--- a/indra/newview/lgghunspell_wrapper.h
+++ b/indra/newview/lgghunspell_wrapper.h
@@ -0,0 +1,75 @@
+/* Copyright (C) 2009 LordGregGreg Back
+
+   This is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+ 
+   This is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+ 
+   You should have received a copy of the GNU Lesser General Public
+   License along with the viewer; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+#ifndef ASPELL_WRAPPER
+#define ASPELL_WRAPPER 1
+
+#if LL_WINDOWS
+#include "hunspell/hunspelldll.h"
+#else
+#include "hunspell/hunspell.hxx"
+#endif
+
+class lggHunSpell_Wrapper
+{
+
+public:
+	static Hunspell* myHunspell;
+
+	static void initSettings();
+	void processSettings();
+
+	std::vector<std::string> getAvailDicts();
+	std::vector<std::string> getInstalledDicts();
+	std::vector<std::string> getDicts();
+	std::vector<std::string> getExtraDicts();
+	void addDictionary(std::string additionalDictionary);
+	void addWordToCustomDictionary(std::string wordToAdd);
+	void addButton(std::string selection);
+	void removeButton(std::string selection);
+	void editCustomButton();
+	void newDictSelection(std::string selection);
+	void getMoreButton(void * data);
+	static std::string dictName2FullName(std::string dictName);
+	static std::string fullName2DictName(std::string fullName);
+	void setNewDictionary(std::string newDict);
+	BOOL isSpelledRight(std::string wordToCheck);
+	std::vector<std::string> getSuggestionList(std::string badWord);
+	S32 findNextError(std::string haystack, int startAt);
+
+	std::vector<std::string> CSV2VEC(std::string csv);
+	std::string VEC2CSV(std::vector<std::string> vec);
+
+	void setSpellCheckHighlight(BOOL highlight);
+	BOOL getSpellCheckHighlight();
+
+private:
+	void createCustomDic();
+	std::string getCorrectPath(std::string file);
+	lggHunSpell_Wrapper();
+	~lggHunSpell_Wrapper();
+
+	void debugTest(std::string testWord);//prints out debug about testing the word
+	std::string currentBaseDic;
+	//std::vector<std::string> languageCodes;
+	//std::vector<std::string> countryCodes;
+//	BOOL* mSpellCheckHighlight;
+};
+
+extern lggHunSpell_Wrapper* glggHunSpell; // the singleton hunspell wrapper
+
+#endif 
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -204,8 +204,8 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mGridsPanel->setDefaultBtn(default_btn);

 	mPrefsAscentSys = new LLPrefsAscentSys();
-	mTabContainer->addTabPanel(mPrefsAscentSys->getPanel(), mPrefsAscentSys->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
-	mPrefsAscentSys->getPanel()->setDefaultBtn(default_btn);
+	mTabContainer->addTabPanel(mPrefsAscentSys, mPrefsAscentSys->getLabel(), FALSE, onTabChanged, mTabContainer);
+	mPrefsAscentSys->setDefaultBtn(default_btn);

 	mPrefsAscentVan = new LLPrefsAscentVan();
 	mTabContainer->addTabPanel(mPrefsAscentVan->getPanel(), mPrefsAscentVan->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -210,6 +210,7 @@
 // </edit>

 #include "llavatarnamecache.h"
+#include "lgghunspell_wrapper.h"

 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -412,6 +413,7 @@ bool idle_startup()
 		//
 		// Initialize stuff that doesn't need data from simulators
 		//
+		glggHunSpell->initSettings();

 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.1d
 		if ( (gSavedSettings.controlExists(RLV_SETTING_MAIN)) && (gSavedSettings.getBOOL(RLV_SETTING_MAIN)) )
--- a/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/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"
@@ -295,7 +295,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"
--- a/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/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="5" min_val="0"
--- a/indra/newview/skins/default/xui/en-us/floater_area_search.xml
+++ b/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>
--- a/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/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."
--- a/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -92,14 +92,14 @@
 			     max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
           track_bottom="true" 
 			     text_color="ChatHistoryTextColor"
-			     text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" />
+			     text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" spell_check="true" />
      <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 			     bottom="28" embedded_items="false" enabled="false"
 			     follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
 			     max_length="2147483647" mouse_opaque="true"
 			     name="Chat History Editor with mute" text_color="ChatHistoryTextColor"
           track_bottom="true" 
-			     text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
+			     text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" spell_check="true"/>
 			<panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
 			     tab_group="1" top="25">
        <string name="gesture_label">Gestures</string>
@@ -108,7 +108,7 @@
 				     handle_edit_keys_directly="false" height="20" label="Click here to chat."
 				     left="0" max_length="254" 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">
--- a/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="false" can_close="true" can_minimize="true" bottom="500" left="500" can_resize="false" height="180" name="EmeraldIRC_dictionaries" title="Download new Dictionaries" width="300">
+     <text bottom="-50" follows="left|top" font="SansSerifSmall" height="20" left="15" name="EmDics_txt" width="300">
+Below is a list of additional dictionaries that can
+be downloaded from the Imprudence website.
+
+Please select the dictionary you wish to have available
+for install, and then press the download button.</text>
+	<combo_box allow_text_entry="false" bottom_delta="-85" left_delta="-10" follows="left|top" height="18"
+		max_chars="255" mouse_opaque="true" name="Emerald_combo_dics" width="290"
+		control_name="Emerald_combo_dics" tool_tip=""/>
+     <button bottom_delta="-35" enabled="true" follows="left|top" font="SansSerif"
+	     halign="center" height="22" label="Download" left_delta="0"
+	     mouse_opaque="true" name="Emerald_dic_download" scale_image="true" width="290" />
+</floater> 
--- a/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -25,7 +25,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 Second Life"
-			     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"
@@ -103,7 +103,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"
@@ -197,7 +197,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"
@@ -409,10 +409,10 @@ 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="-22"
 			     follows="left|top" font="SansSerifSmall" height="16" left="132"
-			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" />
+			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" spell_check="true" />
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
 			     follows="left|top" font="SansSerifSmall" height="16" left="117"
-			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" />
+			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" spell_check="true" />
 			<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="208" mouse_opaque="true"
 			     name="Search" tab_group="5" width="70" />
@@ -455,7 +455,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"
@@ -593,7 +593,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" />
@@ -640,7 +640,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" />
--- a/indra/newview/skins/default/xui/en-us/floater_directory2.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory2.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" />
@@ -80,7 +80,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"
@@ -174,7 +174,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"
@@ -351,10 +351,10 @@ 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="-22"
 			     follows="left|top" font="SansSerifSmall" height="16" left="132"
-			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" />
+			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" spell_check="true" />
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
 			     follows="left|top" font="SansSerifSmall" height="16" left="117"
-			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" />
+			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" spell_check="true" />
 			<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="208" mouse_opaque="true"
 			     name="Search" tab_group="5" width="70" />
@@ -397,7 +397,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"
@@ -535,7 +535,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" />
@@ -582,7 +582,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" />
--- a/indra/newview/skins/default/xui/en-us/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory3.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 Second Life"
-			     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"
@@ -161,7 +161,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"
@@ -255,7 +255,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"
@@ -467,10 +467,10 @@ 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="-22"
 			     follows="left|top" font="SansSerifSmall" height="16" left="132"
-			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" />
+			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" spell_check="true" />
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
 			     follows="left|top" font="SansSerifSmall" height="16" left="117"
-			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" />
+			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" spell_check="true" />
 			<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left="208" mouse_opaque="true"
 			     name="Search" tab_group="5" width="70" />
@@ -513,7 +513,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"
@@ -651,7 +651,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" />
@@ -698,7 +698,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" />
--- a/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
+++ b/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>
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -73,7 +73,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" />
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -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" />
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -71,7 +71,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" />
--- a/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
+++ b/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"
--- a/indra/newview/skins/default/xui/en-us/floater_name_description.xml
+++ b/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"
--- a/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -273,7 +273,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>
--- a/indra/newview/skins/default/xui/en-us/floater_notification.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_notification.xml
@@ -5,7 +5,7 @@
  <text_editor name="payload" type="string" length="1" embedded_items="false" enabled="false"
      follows="left|top|right|bottom" font="SansSerif" 
      width="192" height="140" left="4" bottom="-165" 
-      ignore_tab="false" max_length="65536" mouse_opaque="true" word_wrap="true">
+      ignore_tab="false" max_length="65536" mouse_opaque="true" word_wrap="true" spell_check="true">
    Loading...
  </text_editor>
  <combo_box bottom_delta="-26"  left="10" width="100" height="20" follows="left|bottom" 
--- a/indra/newview/skins/default/xui/en-us/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_pay.xml
@@ -47,7 +47,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 type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-162" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerif" h_pad="0" halign="left" height="18" left="12"
--- a/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/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"
--- a/indra/newview/skins/default/xui/en-us/floater_preview_animation.xml
+++ b/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"
--- a/indra/newview/skins/default/xui/en-us/floater_preview_gesture.xml
+++ b/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"
--- a/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
@@ -23,11 +23,11 @@
 	     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" />
 	<text_editor type="string" length="1" bottom="-327" embedded_items="true" enabled="true"
 	     follows="left|top|right|bottom" font="SansSerif" height="281"
 	     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>
 	<string name="no_object">
--- a/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
@@ -29,7 +29,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" />
 	<string name="no_object">Unable to find object containing this note.:</string>
 	<string name="not_allowed">You are not allowed to view this note.</string>
 </floater>
--- a/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
+++ b/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"
--- a/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
@@ -8,7 +8,7 @@
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-43" enabled="false"
 		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="17" left="93" 
 		max_length="127" mouse_opaque="true" name="desc" select_all_on_focus_received="false" select_on_focus="false" 
-		width="229" />
+		width="229" spell_check="true" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
 		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" 
 		halign="left" height="16" left="13" mouse_opaque="true" name="uuid txt" v_pad="0" width="80">
--- a/indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
+++ b/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" />
--- a/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
@@ -212,7 +212,7 @@
 	     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"
@@ -230,7 +230,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"
--- a/indra/newview/skins/default/xui/en-us/floater_report_bug.xml
+++ b/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:
--- a/indra/newview/skins/default/xui/en-us/floater_script_preview.xml
+++ b/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>
--- a/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
+++ b/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" />
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -161,7 +161,7 @@
 			<text_editor bottom="-399" embedded_items="false"
 			     enabled="true" follows="left|top" font="SansSerifSmall" height="110"
 			     is_unicode="false" left="79" max_length="511" mouse_opaque="true"
-			     name="about" width="321" word_wrap="true" />
+			     name="about" width="321" word_wrap="true" spell_check="true" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-427" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
@@ -276,7 +276,7 @@
 			     border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
 			     font="SansSerifSmall" height="16" is_unicode="false" left="74"
 			     max_length="254" mouse_opaque="true" name="want_to_edit"
-			     width="330" />
+			     width="330" spell_check="true" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
@@ -305,7 +305,7 @@
 			     border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
 			     font="SansSerifSmall" height="16" is_unicode="false" left="74"
 			     max_length="254" mouse_opaque="true" name="skills_edit"
-			     width="330" />
+			     width="330" spell_check="true" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
@@ -411,7 +411,7 @@
 			<text_editor bottom="-347" embedded_items="false"
 			     enabled="true" follows="left|top" font="SansSerifSmall" height="160"
 			     is_unicode="false" left="70" max_length="254" mouse_opaque="false"
-			     name="about" width="330" word_wrap="true" />
+			     name="about" width="330" 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">
@@ -429,7 +429,7 @@ notes.  This person cannot see them, nor can other people.
 			<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="-482" font="SansSerif" halign="center" height="20" label="OK"
--- a/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
@@ -9,7 +9,7 @@
 	     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."
--- a/indra/newview/skins/default/xui/en-us/panel_avatar_pick.xml
+++ b/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" />
--- a/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -13,7 +13,7 @@
 	     handle_edit_keys_directly="false" height="20" label="Click here to chat."
 	     left="107" max_length="254" name="Chat Editor"
 	     select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-	     tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
+	     tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" spell_check="true" />
 	<flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="110"
 	     list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
 	     width="80">
--- a/indra/newview/skins/default/xui/en-us/panel_classified.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_classified.xml
@@ -9,7 +9,7 @@
 	     width="400" />
 	<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."
--- a/indra/newview/skins/default/xui/en-us/panel_event.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_event.xml
@@ -74,7 +74,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"
--- a/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/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"
@@ -51,11 +51,11 @@ Hover your mouse over the options for more help.
 	     mouse_opaque="true" name="insignia" tool_tip="Click to choose a picture"
 	     width="128" />
 	<text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-30" drop_shadow_visible="false" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="160"
+	     bottom_delta="-14" drop_shadow_visible="false" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="144"
 	     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"
--- a/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
@@ -74,7 +74,7 @@ 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 +84,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"
--- a/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -200,7 +200,7 @@ things in this group. There&apos;s a broad variety of Abilities.
 		     border_visible="false" 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_name"
-		     width="145">
+		     width="145" spell_check="true">
 			Employees
 		</line_editor>
 		<text bottom_delta="-16" font="SansSerif" halign="left" height="16" left="0"
@@ -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"
--- a/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
+++ b/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" />
--- a/indra/newview/skins/default/xui/en-us/panel_place.xml
+++ b/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>
--- a/indra/newview/skins/default/xui/en-us/panel_place_small.xml
+++ b/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>
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -283,7 +283,7 @@
 			</text>
 			<text_editor type="string" length="1" bottom_delta="-110" embedded_items="false" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="110" left_delta="0" max_length="1100"
-				mouse_opaque="true" name="im_response" width="230" word_wrap="true"/>
+				mouse_opaque="true" name="im_response" width="230" word_wrap="true" spell_check="true"/>
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 				bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
 				h_pad="0" halign="left" height="18" left_delta="0" mouse_opaque="false"
@@ -524,5 +524,47 @@ Use #f for user's first name, #l for last name,
 				name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"
 				radio_style="false" width="270"/>
 		</panel>
-	</tab_container>
+
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Text Options"
+       left="1" mouse_opaque="true" name="TextOptions" width="418">
+      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+         label="Show misspelled words in red" left="12" mouse_opaque="true" name="SpellDisplay"
+         control_name="SpellDisplay" 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="SpellBase" width="250"
+         control_name="SpellBase" tool_tip=""/>
+      <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_Avail" width="250"
+         control_name="EmSpell_Avail" tool_tip=""/>
+      <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="12" width="250"/>
+      <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
+         name="EmSpell_txt4" width="512">
+        To use spellcheck, right-click a misspelled word
+        (red or otherwise) and select its replacement
+      </text>
+    </panel>
+
+  </tab_container>
 </panel>
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -47,7 +47,7 @@
 	</text>
 	<text_editor type="string" length="1" bottom="-185" 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" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-218" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
--- a/indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
+++ b/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"
--- a/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -103,7 +103,7 @@
 	     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"/>
+	     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"
--- a/indra/newview/skins/default/xui/en-us/panel_top_pick.xml
+++ b/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" />
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -56,6 +56,7 @@ class ViewerManifest(LLManifest):

            # include the entire shaders directory recursively
            self.path("shaders")
+            self.path("dictionaries")
            # ... and the entire windlight directory
            self.path("windlight")
            self.end_prefix("app_settings")
@@ -444,6 +445,9 @@ class DarwinManifest(ViewerManifest):
            self.path("../../libraries/universal-darwin/lib_release/libvorbis.0.dylib", dst="MacOS/libvorbis.0.dylib")
            self.path("../../libraries/universal-darwin/lib_release/libogg.0.dylib", dst="MacOS/libogg.0.dylib")

+            # hunspell library
+            #self.path("../../libraries/universal-darwin/lib_release/libhunspell-1.2.dylib", "MacOS/libhunspell-1.2.dylib");
+
            # most everything goes in the Resources directory
            if self.prefix(src="", dst="Resources"):
                super(DarwinManifest, self).construct()
@@ -789,6 +793,7 @@ class Linux_i686Manifest(LinuxManifest):
            self.path("libalut.so")
            self.path("libopenal.so", "libopenal.so.1")
            self.path("libtcmalloc_minimal.so.0")
+            #self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0")
            self.path("libtcmalloc_minimal.so.0.0.0")
            self.end_prefix("lib")