5 files changed, 10 insertions, 37 deletions

diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index e482bf7..555b244 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
   <viewer version_patch="0" />
 
   <!--string-->
-  <viewer version_test="Experimental 2010.10.02" />
+  <viewer version_test="Experimental 2010.10.06-hotfix" />
   
 </viewer_version>
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/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index adbc4de..63043f0 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -350,34 +350,6 @@ void primbackup::pre_export_object()
 bool primbackup::check_perms( LLSelectNode* node )
 {
         LLPermissions *perms = node->mPermissions;
-        // We check to see if there are megaprims in SL we can export. 
-        // Cludgy, but the only option considering LL's TPV policy.
-        if (gHippoGridManager->getConnectedGrid()->isSecondLife())
-        {
-                bool is_sl_megaprim = false;
-                for (int i = 0; i < 3; ++i)
-                {
-                        if (node->getObject()->getScale().mV[i] > 10)
-                        {
-                                is_sl_megaprim = true;
-                                break;
-                        }
-                }
-
-                if (is_sl_megaprim)
-                {
-                        // The following avatars in Second Life have given Imprudence permission for their full-perm
-                        // megaprims to be exported even if that means changing the creator from themselves:
-                        // McCabe_Maxsted ("3fc0478f-1c40-48a1-b8a7-3b7062efeda1");
-                        // Gene_Replacement ("adfacb56-390b-4fdc-9216-3494f1c59862");
-                        return ((perms->getCreator() == LLUUID("3fc0478f-1c40-48a1-b8a7-3b7062efeda1") ||
-                                        perms->getCreator() == LLUUID("adfacb56-390b-4fdc-9216-3494f1c59862") ||
-                                        perms->getCreator() == gAgent.getID()) &&
-                                        perms->getOwner() == gAgent.getID() &&
-                                        (PERM_ITEM_UNRESTRICTED & perms->getMaskOwner()) == PERM_ITEM_UNRESTRICTED);
-                }
-        }
-
         return (gAgent.getID() == perms->getOwner() &&
                 gAgent.getID() == perms->getCreator() &&
                 (PERM_ITEM_UNRESTRICTED &
@@ -1139,4 +1111,7 @@ void primbackup::upload_next_asset()
                  "Uploaded texture",
                  NULL,
                  NULL);
+
+
 }
+
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">