Merge remote branch 'thickbrick/weekly' into weekly

3 files changed, 6 insertions, 8 deletions

diff --git a/linden/indra/newview/lgghunspell_wrapper.cpp b/linden/indra/newview/lgghunspell_wrapper.cpp
index aa4507c..9548c4f 100644
--- a/linden/indra/newview/lgghunspell_wrapper.cpp
+++ b/linden/indra/newview/lgghunspell_wrapper.cpp
@@ -472,7 +472,7 @@ static char * languageCodesraw[]={
 lggHunSpell_Wrapper::lggHunSpell_Wrapper()
 {
         //languageCodes(begin(languageCodesraw), end(languageCodesraw));    
-        mSpellCheckHighlight = rebind_llcontrol<BOOL>("EmeraldSpellDisplay", &gSavedSettings, false);
+        mSpellCheckHighlight = rebind_llcontrol<BOOL>("EmeraldSpellDisplay", &gSavedSettings, true);
 }
 
 lggHunSpell_Wrapper::~lggHunSpell_Wrapper()
@@ -963,8 +963,5 @@ void lggHunSpell_Wrapper::editCustomButton()
 
 void lggHunSpell_Wrapper::setSpellCheckHighlight(BOOL highlight)
 {
-        if (mSpellCheckHighlight)
-        {
-                *mSpellCheckHighlight = highlight;
-        }
+        gSavedSettings.setBOOL("EmeraldSpellDisplay", highlight);
 }
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 46c125f..0c35b32 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -372,9 +372,10 @@ bool LLTextureCacheRemoteWorker::doRead()
         if (!done && (mState == LOCAL))
         {
                 llassert(local_size != 0);      // we're assuming there is a non empty local file here...
-                if (!mDataSize || mDataSize > local_size)
+                llassert(mReadData == NULL);
+                if (!mDataSize || mDataSize > (local_size - mOffset))
                 {
-                        mDataSize = local_size;
+                        mDataSize = local_size - mOffset;
                 }
                 // Allocate read buffer
                 mReadData = new U8[mDataSize];
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index a0c9e28..c3ee726 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -139,7 +139,7 @@
          name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
          right="490" width="18"/>
       <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-         label="Show misspelled words in red (requires restart)" left="12" mouse_opaque="true" name="EmeraldSpellDisplay"
+         label="Show misspelled words in red" left="12" mouse_opaque="true" name="EmeraldSpellDisplay"
          control_name="EmeraldSpellDisplay" width="126"/>
       <text bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16" left="12"
          name="EmSpell_txt1" width="512">