16 files changed, 180 insertions, 136 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index b3da7fd..e73b287 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -231,38 +231,22 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
         menu->appendSeparator("Transep");
         LLMenuGL* translatemenu = new LLMenuGL("Translate To");
         translatemenu->setCanTearOff(FALSE);
-        SpellMenuBind* t=new SpellMenuBind;t->origin=this;t->word="en";
-        translatemenu->append(new LLMenuItemCallGL("English", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="da";
-        translatemenu->append(new LLMenuItemCallGL("Danish", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="de";
-        translatemenu->append(new LLMenuItemCallGL("Deutsch(German)", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="es";
-        translatemenu->append(new LLMenuItemCallGL("Spanish", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="fr";
-        translatemenu->append(new LLMenuItemCallGL("French", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="it";
-        translatemenu->append(new LLMenuItemCallGL("Italian", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="hu";
-        translatemenu->append(new LLMenuItemCallGL("Hungarian", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="nl";
-        translatemenu->append(new LLMenuItemCallGL("Dutch", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="pl";
-        translatemenu->append(new LLMenuItemCallGL("Polish", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="pt";
-        translatemenu->append(new LLMenuItemCallGL("Portugese", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="ru";
-        translatemenu->append(new LLMenuItemCallGL("Russian", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="tr";
-        translatemenu->append(new LLMenuItemCallGL("Turkish", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="uk";
-        translatemenu->append(new LLMenuItemCallGL("Ukrainian", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="zh";
-        translatemenu->append(new LLMenuItemCallGL("Chinese", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="ja";
-        translatemenu->append(new LLMenuItemCallGL("Japanese", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="ko";
-        translatemenu->append(new LLMenuItemCallGL("Korean", context_translate, context_enable_translate, t));
+        translatemenu->append(new LLMenuItemCallGL("en", "English", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("da", "Danish", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("de", "Deutsch(German)", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("es", "Spanish", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("fr", "French", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("it", "Italian", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("hu", "Hungarian", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("nl", "Dutch", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("pl", "Polish", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("pt", "Portugese", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("ru", "Russian", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("tr", "Turkish", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("uk", "Ukrainian", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("zh", "Chinese", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("ja", "Japanese", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("ko", "Korean", context_translate, context_enable_translate, this));
 
         menu->appendMenu(translatemenu);
         menu->appendSeparator("Spelsep");
@@ -555,15 +539,20 @@ void LLLineEditor::spell_correct(void* data)
 
 BOOL LLLineEditor::context_enable_translate(void* data)
 {
-        SpellMenuBind* t = (SpellMenuBind*)data;
-        return (t && t->origin && t->origin->canTranslate());
+        LLLineEditor* line = (LLLineEditor*)data;
+        return line && line->canTranslate();
 }
 
 void LLLineEditor::context_translate(void * data)
 {
-        SpellMenuBind* t = (SpellMenuBind*)data;
-        LLLineEditor* line = t->origin;
-        const std::string &toLang = t->word;//LLTranslate::getTranslateLanguage();
+        LLLineEditor* line = (LLLineEditor*)data;
+        LLMenuGL* menu = line ? (LLMenuGL*)(line->mPopupMenuHandle.get()) : NULL;
+        LLMenuGL* translate_menu = menu ? menu->getChildMenuByName("Translate To", TRUE) : NULL;
+        if (!translate_menu)
+        {
+                return;
+        }
+        const std::string to_lang = translate_menu->getHighlightedItem()->getName();
 
         bool has_text = false;
         S32 start, length;
@@ -584,8 +573,8 @@ void LLLineEditor::context_translate(void * data)
         if (has_text)
         {
                 std::string to_translate = wstring_to_utf8str(line->getWText().substr(start, length));
-                LLHTTPClient::ResponderPtr result = LineChatTranslationReceiver::build(toLang, line, start, length);
-                LLTranslate::translateMessage(result,"", toLang, to_translate);
+                LLHTTPClient::ResponderPtr result = LineChatTranslationReceiver::build(to_lang, line, start, length);
+                LLTranslate::translateMessage(result,"", to_lang, to_translate);
         }
 }
 
@@ -790,7 +779,7 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
 
         //setCursorAtLocalPos( x);
         S32 wordStart = 0;
-        S32 wordEnd = 0;
+        S32 wordLen = 0;
         S32 pos = calculateCursorFromMouse(x);
 
         LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
@@ -819,11 +808,11 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                 if (!mReadOnly && mSpellCheckable)
                 {
                         // search for word matches
-                        bool is_word_part = getWordBoundriesAt(pos, &wordStart, &wordEnd);
+                        bool is_word_part = getWordBoundriesAt(pos, &wordStart, &wordLen);
                         if (is_word_part)
                         {
                                 const LLWString& text = mText.getWString();
-                                std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordEnd-wordStart));
+                                std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordLen));
                                 
                                 if (!glggHunSpell->isSpelledRight(selectedWord))
                                 {       
@@ -835,7 +824,7 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                                                 SpellMenuBind * tempStruct = new SpellMenuBind;
                                                 tempStruct->origin = this;
                                                 tempStruct->word = suggs[i];
-                                                tempStruct->wordPositionEnd = wordEnd;
+                                                tempStruct->wordPositionEnd = wordStart + wordLen;
                                                 tempStruct->wordPositionStart=wordStart;
                                                 LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
                                                         tempStruct->word, spell_correct, NULL, tempStruct);
@@ -847,7 +836,7 @@ BOOL LLLineEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                                         SpellMenuBind * tempStruct = new SpellMenuBind;
                                         tempStruct->origin = this;
                                         tempStruct->word = selectedWord;
-                                        tempStruct->wordPositionEnd = wordEnd;
+                                        tempStruct->wordPositionEnd = wordStart + wordLen;
                                         tempStruct->wordPositionStart=wordStart;
                                         LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
                                                 "Add Word", spell_add, NULL, tempStruct);
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 8dcb014..fdf8bcf 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -398,38 +398,22 @@ LLTextEditor::LLTextEditor(
         menu->appendSeparator("Transep");
         LLMenuGL* translatemenu = new LLMenuGL("Translate To");
         translatemenu->setCanTearOff(FALSE);
-        SpellMenuBind* t=new SpellMenuBind;t->origin=this;t->word="en";
-        translatemenu->append(new LLMenuItemCallGL("English", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="da";
-        translatemenu->append(new LLMenuItemCallGL("Danish", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="de";
-        translatemenu->append(new LLMenuItemCallGL("Deutsch(German)", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="es";
-        translatemenu->append(new LLMenuItemCallGL("Spanish", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="fr";
-        translatemenu->append(new LLMenuItemCallGL("French", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="it";
-        translatemenu->append(new LLMenuItemCallGL("Italian", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="hu";
-        translatemenu->append(new LLMenuItemCallGL("Hungarian", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="nl";
-        translatemenu->append(new LLMenuItemCallGL("Dutch", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="pl";
-        translatemenu->append(new LLMenuItemCallGL("Polish", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="pt";
-        translatemenu->append(new LLMenuItemCallGL("Portugese", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="ru";
-        translatemenu->append(new LLMenuItemCallGL("Russian", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="tr";
-        translatemenu->append(new LLMenuItemCallGL("Turkish", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="uk";
-        translatemenu->append(new LLMenuItemCallGL("Ukrainian", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="zh";
-        translatemenu->append(new LLMenuItemCallGL("Chinese", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="ja";
-        translatemenu->append(new LLMenuItemCallGL("Japanese", context_translate, context_enable_translate, t));
-        t=new SpellMenuBind;t->origin=this;t->word="ko";
-        translatemenu->append(new LLMenuItemCallGL("Korean", context_translate, context_enable_translate, t));
+        translatemenu->append(new LLMenuItemCallGL("en", "English", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("da", "Danish", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("de", "Deutsch(German)", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("es", "Spanish", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("fr", "French", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("it", "Italian", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("hu", "Hungarian", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("nl", "Dutch", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("pl", "Polish", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("pt", "Portugese", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("ru", "Russian", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("tr", "Turkish", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("uk", "Ukrainian", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("zh", "Chinese", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("ja", "Japanese", context_translate, context_enable_translate, this));
+        translatemenu->append(new LLMenuItemCallGL("ko", "Korean", context_translate, context_enable_translate, this));
         
         menu->appendMenu(translatemenu);
         menu->appendSeparator("Spelsep");
@@ -483,15 +467,20 @@ void LLTextEditor::context_copy(void* data)
 
 BOOL LLTextEditor::context_enable_translate(void * data)
 {
-        SpellMenuBind* t = (SpellMenuBind*)data;
-        return (t && t->origin && t->origin->canTranslate());
+        LLTextEditor* editor = (LLTextEditor*)data;
+        return editor && editor->canTranslate();
 }
 
 void LLTextEditor::context_translate(void * data)
 {
-        SpellMenuBind* t = (SpellMenuBind*)data;
-        LLTextEditor* line = t->origin;
-        const std::string &toLang = t->word;//LLTranslate::getTranslateLanguage();
+        LLTextEditor* line = (LLTextEditor*)data;
+        LLMenuGL* menu = line ? (LLMenuGL*)(line->mPopupMenuHandle.get()) : NULL;
+        LLMenuGL* translate_menu = menu ? menu->getChildMenuByName("Translate To", TRUE) : NULL;
+        if (!translate_menu)
+        {
+                return;
+        }
+        const std::string to_lang = translate_menu->getHighlightedItem()->getName();
 
         bool has_text = false;
         S32 start, length;
@@ -512,8 +501,8 @@ void LLTextEditor::context_translate(void * data)
         if (has_text)
         {
                 const std::string to_translate =  wstring_to_utf8str(line->getWText().substr(start, length));
-                LLHTTPClient::ResponderPtr result = TextChatTranslationReceiver::build(toLang, line, start, length);
-                LLTranslate::translateMessage(result,"", toLang, to_translate);
+                LLHTTPClient::ResponderPtr result = TextChatTranslationReceiver::build(to_lang, line, start, length);
+                LLTranslate::translateMessage(result,"", to_lang, to_translate);
         }
 }
 
@@ -1513,7 +1502,7 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
 
         //setCursorAtLocalPos( x, y, TRUE );
         S32 wordStart = 0;
-        S32 wordEnd = 0;
+        S32 wordLen = 0;
         S32 pos = getCursorPosFromLocalCoord(x,y,TRUE);
 
         LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
@@ -1537,11 +1526,11 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                 menu->setItemVisible("Spelsep", !mReadOnly && mSpellCheckable);
                 if (!mReadOnly && mSpellCheckable)
                 {
-                        bool is_word_part = getWordBoundriesAt(pos, &wordStart, &wordEnd);
+                        bool is_word_part = getWordBoundriesAt(pos, &wordStart, &wordLen);
                         if (is_word_part)
                         {
                                 const LLWString &text = mWText;
-                                std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordEnd-wordStart));
+                                std::string selectedWord(std::string(text.begin(), text.end()).substr(wordStart,wordLen));
 
                                 if (!glggHunSpell->isSpelledRight(selectedWord))
                                 {
@@ -1553,7 +1542,7 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                                                 SpellMenuBind * tempStruct = new SpellMenuBind;
                                                 tempStruct->origin = this;
                                                 tempStruct->word = suggs[i];
-                                                tempStruct->wordPositionEnd = wordEnd;
+                                                tempStruct->wordPositionEnd = wordStart + wordLen;
                                                 tempStruct->wordPositionStart=wordStart;
                                                 tempStruct->wordY=y;
                                                 LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
@@ -1565,7 +1554,7 @@ BOOL LLTextEditor::handleRightMouseDown( S32 x, S32 y, MASK mask )
                                         SpellMenuBind * tempStruct = new SpellMenuBind;
                                         tempStruct->origin = this;
                                         tempStruct->word = selectedWord;
-                                        tempStruct->wordPositionEnd = wordEnd;
+                                        tempStruct->wordPositionEnd = wordStart + wordLen;
                                         tempStruct->wordPositionStart=wordStart;
                                         tempStruct->wordY=y;
                                         LLMenuItemCallGL * suggMenuItem = new LLMenuItemCallGL(
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index aeb5c0b..d33285d 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -6683,7 +6683,7 @@
     <key>Comment</key>
     <string>Double resolution of snapshot from current window resolution</string>
     <key>Persist</key>
-    <integer>1</integer>
+    <integer>0</integer>
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
@@ -10926,6 +10926,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+        <key>HighlightFriends</key>
+    <map>
+      <key>Comment</key>
+      <string>Display avatar name text in bold if is a friend</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>SnapEnabled</key>
     <map>
       <key>Comment</key>
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/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2496d13..96fc451 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1189,6 +1189,9 @@ bool LLAppViewer::cleanup()
         {                                       //*might* crash imprudence TODO: fix the voiceclient instead
                 //this deletes all your buddies
                 LLAvatarTracker::instance().reset();
+                // reset group data. Blame LL for the need to clear a member variable through a global
+                LLGroupMgr::getInstance()->clearGroups();
+                gAgent.mGroups.clear();
         }
 
         //reset balance for not playing the UI-Sound 
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index a2cba4c..fc6073a 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -91,6 +91,7 @@ BOOL LLPanelGeneral::postBuild()
         childSetValue("show_all_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitleAll"));
         childSetValue("show_my_name_checkbox", gSavedSettings.getBOOL("RenderNameHideSelf"));
         childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
+        childSetValue("highlight_friends_checkbox", gSavedSettings.getBOOL("HighlightFriends"));
         childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
         childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
         childSetValue("afk_timeout_checkbox", gSavedSettings.getBOOL("AllowIdleAFK"));
@@ -163,6 +164,7 @@ void LLPanelGeneral::apply()
         gSavedSettings.setBOOL("RenderHideGroupTitleAll", childGetValue("show_all_title_checkbox"));
         gSavedSettings.setBOOL("RenderNameHideSelf", childGetValue("show_my_name_checkbox"));
         gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
+        gSavedSettings.setBOOL("HighlightFriends", childGetValue("highlight_friends_checkbox"));
         gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
         gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
         gSavedSettings.setBOOL("AllowIdleAFK", childGetValue("afk_timeout_checkbox"));
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 83abcf4..1634950 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -64,6 +64,7 @@
 #include "llinventorymodel.h"
 #include "llmenugl.h"
 #include "llmutelist.h"
+#include "llparcel.h" // RezWithLandGroup
 #include "llstatusbar.h"
 #include "llsurface.h"
 #include "lltool.h"
@@ -77,6 +78,7 @@
 #include "llviewermenu.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
+#include "llviewerparcelmgr.h" // RezWithLandGroup
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llvoavatar.h"
@@ -3135,7 +3137,20 @@ void LLSelectMgr::packDuplicateOnRayHead(void *user_data)
         msg->nextBlockFast(_PREHASH_AgentData);
         msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
         msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID() );
-        msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID() );
+        LLUUID group_id = gAgent.getGroupID();
+        if (gSavedSettings.getBOOL("RezWithLandGroup"))
+        {
+                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+                if (gAgent.isInGroup(parcel->getGroupID()))
+                {
+                        group_id = parcel->getGroupID();
+                }
+                else if (gAgent.isInGroup(parcel->getOwnerID()))
+                {
+                        group_id = parcel->getOwnerID();
+                }
+        }
+        msg->addUUIDFast(_PREHASH_GroupID, group_id);
         msg->addVector3Fast(_PREHASH_RayStart, data->mRayStartRegion );
         msg->addVector3Fast(_PREHASH_RayEnd, data->mRayEndRegion );
         msg->addBOOLFast(_PREHASH_BypassRaycast, data->mBypassRaycast );
@@ -3907,6 +3922,18 @@ void LLSelectMgr::packAgentAndSessionAndGroupID(void* user_data)
 void LLSelectMgr::packDuplicateHeader(void* data)
 {
         LLUUID group_id(gAgent.getGroupID());
+        if (gSavedSettings.getBOOL("RezWithLandGroup"))
+        {
+                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+                if (gAgent.isInGroup(parcel->getGroupID()))
+                {
+                        group_id = parcel->getGroupID();
+                }
+                else if (gAgent.isInGroup(parcel->getOwnerID()))
+                {
+                        group_id = parcel->getOwnerID();
+                }
+        }
         packAgentAndSessionAndGroupID(&group_id);
 
         LLDuplicateData* dup_data = (LLDuplicateData*) data;
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/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index d5c4de1..00b0c9f 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -67,6 +67,7 @@
 
 #include "llparcel.h" // RezWithLandGroup
 #include "llviewerparcelmgr.h" // RezWithLandGroup
+#include "roles_constants.h" // Ele: Land Group Override
 
 const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
 
@@ -264,9 +265,11 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
         // RezWithLandGroup 2009-05, If avatar is in land group/land owner group,
         // it rezzes it with it to prevent autoreturn/whatever
-        if ( gSavedSettings.getBOOL("RezWithLandGroup") )
+
+        // Ele: if agent is in land group and has create powers but the tag is not active, force it to enable build seamlessly
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if ( gSavedSettings.getBOOL("RezWithLandGroup"))
         {
-                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                 if ( gAgent.isInGroup(parcel->getGroupID()) )
                 {
                         gMessageSystem->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
@@ -280,7 +283,11 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
                         gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
                 }
         }
-        else 
+        else if (gAgent.hasPowerInGroup(parcel->getGroupID(), GP_LAND_ALLOW_CREATE) && !parcel->getIsGroupOwned())
+        {
+                gMessageSystem->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
+        }
+        else
         {
                 gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
         }
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 364dcfd..432fcc5 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -43,6 +43,7 @@
 #include "llfloaternamedesc.h"
 #include "llfloatersnapshot.h"
 #include "llinventorymodel.h"   // gInventory
+#include "llinventoryview.h"    // open_texture()
 #include "llresourcedata.h"
 #include "llfloaterperms.h"
 #include "llstatusbar.h"
@@ -875,7 +876,9 @@ void temp_upload_done_callback(const LLUUID& uuid, void* user_data, S32 result,
                 item->updateServer(TRUE);
                 gInventory.updateItem(item);
                 gInventory.notifyObservers();
-        }else //        if(result >= 0)
+                open_texture(item_id, std::string("Texture: ") + item->getName(), TRUE, LLUUID::null, FALSE);
+        }
+        else // if(result >= 0)
         {
                 LLSD args;
                 args["FILE"] = LLInventoryType::lookupHumanReadable(data->mInventoryType);
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 61b91fe..257ce0d 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -651,15 +651,21 @@ BOOL LLViewerParcelMgr::agentCanBuild() const
 {
         if (mAgentParcel)
         {
-                return (gAgent.isGodlike()
-                                || (mAgentParcel->allowModifyBy(
-                                                gAgent.getID(),
-                                                gAgent.getGroupID())));
-        }
-        else
-        {
-                return gAgent.isGodlike();
+                const LLUUID parcel_group = mAgentParcel->getGroupID();
+                const LLUUID active_group = gAgent.getGroupID();
+
+                if (gAgent.isGodlike())
+                        return true;
+
+                if (mAgentParcel->allowModifyBy(gAgent.getID(), active_group))
+                        return true;
+
+                // Ele: enable build option if we are in the land group and we have create powers, even if the group tag is not active
+                if (gAgent.isInGroup(parcel_group) && gAgent.hasPowerInGroup(parcel_group, GP_LAND_ALLOW_CREATE))
+                        return true;
         }
+
+        return gAgent.isGodlike();
 }
 
 BOOL LLViewerParcelMgr::agentCanTakeDamage() const
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 6e16ea3..422b22f 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3801,15 +3801,20 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                         }
                         else
                         {
-                                static BOOL* sSmallAvatarNames = rebind_llcontrol<BOOL>("SmallAvatarNames", &gSavedSettings, true);
-                                if (*sSmallAvatarNames)
+                                S32 style = LLFontGL::NORMAL;
+
+                                if (!mIsSelf && gSavedSettings.getBOOL("HighlightFriends"))
                                 {
-                                        mNameText->setFont(LLFontGL::getFontSansSerif());
+                                        if (is_agent_friend(this->getID())) // Ele: bold for friends
+                                                style |= LLFontGL::BOLD;
                                 }
+
+                                static BOOL* sSmallAvatarNames = rebind_llcontrol<BOOL>("SmallAvatarNames", &gSavedSettings, true);
+                                if (*sSmallAvatarNames)
+                                        mNameText->setFont(LLFontGL::getFont(LLFontDescriptor("SansSerif","Medium",style)));
                                 else
-                                {
-                                        mNameText->setFont(LLFontGL::getFontSansSerifBig());
-                                }
+                                        mNameText->setFont(LLFontGL::getFont(LLFontDescriptor("SansSerif","Large",style)));
+
                                 mNameText->setTextAlignment(LLHUDText::ALIGN_TEXT_CENTER);
                                 mNameText->setFadeDistance(CHAT_NORMAL_RADIUS, 5.f);
                                 mNameText->setVisibleOffScreen(FALSE);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 8dfd43c..e02abe2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <floater name="minimap" short_title="Mini-Map"
-         height="455" width="200" min_height="400" min_width="240"
+         height="455" width="200" min_height="325" min_width="200"
          follows="top|right" can_close="true" can_drag_on_left="false"
          can_minimize="true" can_resize="true" can_tear_off="false"
                rect_control="FloaterMiniMapRect">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 3b039de..db4d1e1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -136,10 +136,10 @@
         </combo_box>
 
         <spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
-             increment="32" label="Width" label_width="30" left="10" max_val="6016"
+             increment="32" label="Width" label_width="30" left="10" max_val="4096"
              min_val="32" name="snapshot_width" width="95" allow_text_entry="false"/>
         <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
-             increment="32" label="Height" label_width="35" left="110" max_val="6016"
+             increment="32" label="Height" label_width="35" left="110" max_val="4096"
              min_val="32" name="snapshot_height" width="95" allow_text_entry="false"/>
         <check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
              name="keep_aspect_check" />
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">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 7b4b809..badd2b4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -44,6 +44,10 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide my name on my screen" left="151" name="show_my_name_checkbox"
              width="200" />
+        <check_box bottom_delta="-20" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Highlight friends tags" left="151" name="highlight_friends_checkbox"
+             width="200" />
         <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
              halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
              width="394">
@@ -57,34 +61,34 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide my group title" left="151" name="show_my_title_checkbox"
              radio_style="false" width="256" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230"
              can_apply_immediately="false" color="1 1 1 1"
              enabled="true" follows="left|top" height="65" label="" left="153"
              mouse_opaque="true" name="effect_color_swatch"
              tool_tip="Click to open Color Picker" width="55" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-235" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
     UI Size:
   </text>
-  <slider bottom="-217" can_edit_text="true"
+  <slider bottom="-237" can_edit_text="true"
              decimal_digits="3" enabled="true" height="16" increment="0.001"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
              name="ui_scale_slider" show_text="true" value="1" width="220" />
-  <button bottom="-221" enabled="true" follows="left|top"
+  <button bottom="-241" enabled="true" follows="left|top"
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Reset" left_delta="226" mouse_opaque="true"
              name="reset_ui_size" scale_image="true" width="80" />
-  <check_box bottom="-236" enabled="true" follows="left|top"
+  <check_box bottom="-256" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
-  <check_box bottom="-260" enabled="true" follows="left|top"
+  <check_box bottom="-280" enabled="true" follows="left|top"
                    font="SansSerifSmall" height="16" initial_value="false"
                    label="Go Away/AFK when idle" left="330" mouse_opaque="true"
                    name="afk_timeout_checkbox" radio_style="false" width="256" />
-  <spinner bottom="-260" decimal_digits="0" enabled="true"
+  <spinner bottom="-280" decimal_digits="0" enabled="true"
              follows="left|top" height="16" increment="1" initial_val="300"
              label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
@@ -105,18 +109,18 @@
        mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
        width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
                  Rating:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
              mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
                  I want to access content rated:
         </text>
-        <combo_box bottom="-318" follows="left|top" height="18" left="315"
+        <combo_box bottom="-338" follows="left|top" height="18" left="315"
              mouse_opaque="true" name="maturity_desired_combobox" width="150">
                 <combo_item name="Desired_Adult" value="42">
                         PG, Mature and Adult
@@ -129,7 +133,7 @@
                 </combo_item>
         </combo_box>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
              mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
                  PG only
@@ -147,25 +151,25 @@
                 Nametags:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-155" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-175" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
                 Selection Beam Color:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-274" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
              mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
                 seconds
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-372" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
              mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
                 Clock:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-404" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
              mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
                 Language:
@@ -180,7 +184,7 @@
         <string name="region_name_prompt">
                 &lt;Type region name&gt;
         </string>
-        <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="false" bottom="-372" enabled="true" follows="left|top"
              height="18" left="153" max_chars="20" mouse_opaque="true"
              name="time_combobox" width="146">
                 <combo_item type="string" name="12HourTime" value="PST 12">
@@ -193,7 +197,7 @@
                         UTC
                 </combo_item>
         </combo_box>
-        <combo_box allow_text_entry="true" bottom="-382" enabled="true"
+        <combo_box allow_text_entry="true" bottom="-402" enabled="true"
              follows="left|top" height="16" left="153" max_chars="135"
              mouse_opaque="true" name="language_combobox" width="146">
                 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">