merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3

* Bugs: EXT-848 EXT-865
* New Dev: EXT-790 EXT-822

4 files changed, 10 insertions, 25 deletions

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index ba383a8dee..e0b7aeb77e 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -556,8 +556,6 @@ BOOL LLPanelAvatarMeProfile::postBuild()
 	childSetCommitCallback("status_combo", boost::bind(&LLPanelAvatarMeProfile::onStatusChanged, this), NULL);
 	childSetCommitCallback("status_me_message_text", boost::bind(&LLPanelAvatarMeProfile::onStatusMessageChanged, this), NULL);
 
-	childSetTextArg("partner_edit_link", "[URL]", getString("partner_edit_link_url"));
-
 	resetControls();
 	resetData();
 
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index bde6d1cf6c..9ae58d1cb6 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -134,11 +134,13 @@ BOOL LLPanelPick::postBuild()
 		childSetAction("teleport_btn", boost::bind(&LLPanelPick::onClickTeleport, this));
 		childSetAction("show_on_map_btn", boost::bind(&LLPanelPick::onClickMap, this));
 
-		if (!mBackCb.empty())
-		{
-			LLButton* button = findChild<LLButton>("back_btn");
-			if (button) button->setClickedCallback(mBackCb);
-		}
+	}
+
+	// EXT-822. We have to process "Back" button click in both Edit & View Modes
+	if (!mBackCb.empty())
+	{
+		LLButton* button = findChild<LLButton>("back_btn");
+		if (button) button->setClickedCallback(mBackCb);
 	}
 
 	return TRUE;
@@ -435,11 +437,8 @@ void LLPanelPick::updateButtons()
 void LLPanelPick::setExitCallback(commit_callback_t cb)
 {
 	mBackCb = cb;
-	if (!mEditMode)
-	{
-		LLButton* button = findChild<LLButton>("back_btn");
-		if (button) button->setClickedCallback(mBackCb);
-	}
+	LLButton* button = findChild<LLButton>("back_btn");
+	if (button) button->setClickedCallback(mBackCb);
 }
 
 //static
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index e5a417e3d0..0af42bfc74 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -219,6 +219,7 @@
          name="groups_panel"
          width="285">
             <group_list
+             draw_heading="false"
              follows="left|top|right|bottom"
              height="357"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 41de34fbed..580855e115 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -21,10 +21,6 @@
      name="my_account_link_url"
      value="http://secondlife.com/account" />
     <string
-     name="partner_edit_link_url">
-        http://www.secondlife.com/account/partners.php?lang=en
-    </string>
-    <string
      name="no_partner_text"
      value="None" />
     <scroll_container
@@ -217,15 +213,6 @@
          top_pad="15"
          value="Partner:"
          width="100" />
-        <text
-         follows="left|top"
-         height="15"
-         layout="topleft"
-         left_pad="10"
-         name="partner_edit_link"
-         top_delta="0"
-         value="[[URL] Edit]"
-         width="100" />
         <panel
          follows="left|top|right"
          height="15"